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

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

Merged
merged 3 commits into from
Jul 11, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 6, 2024

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.
  • 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.

This is an automatic backport of pull request #4893 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Jun 6, 2024
Copy link
Contributor Author

mergify bot commented Jun 6, 2024

Cherry-pick of e6044e0 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
Copy link
Contributor

@JesusPoderoso JesusPoderoso removed the conflicts Backport PR wich git cherry pick failed label Jun 10, 2024
@JesusPoderoso JesusPoderoso self-requested a review June 10, 2024 12:20
* Refs #21136: Replace const char* with string

Signed-off-by: Mario Dominguez <[email protected]>

* Refs #21136: Update fastRTPS_profiles.xsd

Signed-off-by: Mario Dominguez <[email protected]>

* Refs #21136: Implement flow controller descriptor list in XML related source files

Signed-off-by: Mario Dominguez <[email protected]>

* Refs #21136: Update tests

Signed-off-by: Mario Dominguez <[email protected]>

* Refs #21136: versions.md

Signed-off-by: Mario Dominguez <[email protected]>

* Refs #21136: Linter

Signed-off-by: Mario Dominguez <[email protected]>

* Refs #21136: Apply rev

Signed-off-by: Mario Dominguez <[email protected]>

---------

Signed-off-by: Mario Dominguez <[email protected]>
(cherry picked from commit e6044e0)

# Conflicts:
#	test/unittest/xmlparser/XMLProfileParserTests.cpp
#	versions.md
* Refs #21054: Revert to const char* for flow controller names

Signed-off-by: Mario Dominguez <[email protected]>

* Refs #21054: Handle flow controller names in a XMLParser collection

Signed-off-by: Mario Dominguez <[email protected]>

* Refs #21054: Apply Miguel suggestion

Signed-off-by: Mario Dominguez <[email protected]>

* Refs #21054: Apply second suggestion

Signed-off-by: Mario Dominguez <[email protected]>

---------

Signed-off-by: Mario Dominguez <[email protected]>
@JesusPoderoso JesusPoderoso requested review from JesusPoderoso and removed request for JesusPoderoso June 10, 2024 12:21
@github-actions github-actions bot added the ci-pending PR which CI is running label Jun 10, 2024
@JesusPoderoso
Copy link
Contributor

@richiprosima please test this

@JesusPoderoso JesusPoderoso added to-do and removed ci-pending PR which CI is running labels Jun 18, 2024
Signed-off-by: Mario Dominguez <[email protected]>
@Mario-DL Mario-DL added ci-pending PR which CI is running and removed to-do labels Jul 11, 2024
@Mario-DL Mario-DL requested review from JesusPoderoso and removed request for JesusPoderoso July 11, 2024 06:17
Copy link
Contributor

@JesusPoderoso JesusPoderoso left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with green CI

@JesusPoderoso JesusPoderoso 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 Jul 11, 2024
@JesusPoderoso
Copy link
Contributor

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

@EduPonz EduPonz merged commit 212d05a into 2.13.x Jul 11, 2024
17 of 18 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.13.x/pr-4893 branch July 11, 2024 12:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants