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.

Sign up for GitHub

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

Jump to bottom

[19315] Allow participant profiles with no rtps tag #3771

Merged
merged 3 commits into from
Aug 3, 2023
Merged

[19315] Allow participant profiles with no rtps tag #3771

merged 3 commits into from
Aug 3, 2023

Conversation

EduPonz
Copy link

@EduPonz EduPonz commented Aug 2, 2023 •
edited by richiware
Loading

Description

According to the XSD schema, an XML configuration file can include an empty DomainParticipant profile, meaning without any domainId or rtps tags.

<?xml version="1.0" encoding="UTF-8" ?>
<dds xmlns="http://www.eprosima.com/XMLSchemas/fastRTPS_Profiles">
    <profiles>
        <participant profile_name="empty_participant">
        </participant>
    </profiles>
</dds>

However, the XMLParser was expecting a minimum occurrences of 1 for the rtps tag, so the above XML passes the validation, but fails to load.

This PR fixes that inconsistency by allowing an empty participant profile.

@Mergifyio backport 2.11.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.
  • Changes are ABI compatible.
  • Changes are API compatible.
  • N/A: New feature has been added to the versions.md file (if applicable).
  • N/A: 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.
  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

@EduPonz EduPonz added this to the v2.12.0 milestone Aug 2, 2023
@EduPonz EduPonz requested a review from richiware August 2, 2023 05:08
@EduPonz
Refs #19315: Allow participant profiles with no rtps tag
1b2d557 
Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
@EduPonz EduPonz force-pushed the bugfix/xml_allow_no_rpts_tag branch from 888a650 to 1b2d557 Compare August 2, 2023 05:12
@EduPonz
Copy link
Author

EduPonz commented Aug 2, 2023

@richiprosima please test this

@EduPonz
Copy link
Author

EduPonz commented Aug 2, 2023

@Mergifyio backport 2.11.x 2.10.x 2.6.x

@mergify
Copy link
Contributor

mergify bot commented Aug 2, 2023 •
edited
Loading

backport 2.11.x 2.10.x 2.6.x

✅ Backports have been created

richiware
richiware requested changes Aug 2, 2023
View reviewed changes
src/cpp/rtps/xmlparser/XMLParser.cpp Outdated Show resolved Hide resolved
src/cpp/rtps/xmlparser/XMLParser.cpp Outdated Show resolved Hide resolved
@EduPonz
Refs #19315: Apply suggestions
0949e52 
Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
@EduPonz
Refs #19315: Apply suggestions 2
9035b93 
Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
@richiware
Copy link
Member

@richiprosima please test this

@EduPonz EduPonz added the ci-pending PR which CI is running label Aug 3, 2023
@EduPonz EduPonz merged commit 9bcd313 into master Aug 3, 2023
5 of 8 checks passed
@EduPonz EduPonz deleted the bugfix/xml_allow_no_rpts_tag branch August 3, 2023 11:40
@EduPonz EduPonz removed the ci-pending PR which CI is running label Aug 3, 2023
mergify bot pushed a commit that referenced this pull request Aug 3, 2023
@EduPonz @mergify
Allow participant profiles with no rtps tag (#3771)
76e74fa 
* Refs #19315: Allow participant profiles with no rtps tag

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

* Refs #19315: Apply suggestions

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

* Refs #19315: Apply suggestions 2

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

---------

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
(cherry picked from commit 9bcd313)

# Conflicts:
#	test/unittest/xmlparser/XMLParserTests.cpp
mergify bot pushed a commit that referenced this pull request Aug 3, 2023
@EduPonz @mergify
Allow participant profiles with no rtps tag (#3771)
f8d871e 
* Refs #19315: Allow participant profiles with no rtps tag

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

* Refs #19315: Apply suggestions

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

* Refs #19315: Apply suggestions 2

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

---------

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
(cherry picked from commit 9bcd313)

# Conflicts:
#	test/unittest/xmlparser/XMLParserTests.cpp
@mergify mergify bot mentioned this pull request Aug 3, 2023
Merged
mergify bot pushed a commit that referenced this pull request Aug 3, 2023
@EduPonz @mergify
Allow participant profiles with no rtps tag (#3771)
96ff66b 
* Refs #19315: Allow participant profiles with no rtps tag

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

* Refs #19315: Apply suggestions

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

* Refs #19315: Apply suggestions 2

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

---------

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
(cherry picked from commit 9bcd313)

# Conflicts:
#	src/cpp/rtps/xmlparser/XMLParser.cpp
This was referenced Aug 3, 2023
Merged
Merged
EduPonz added a commit that referenced this pull request Aug 7, 2023
@EduPonz
Allow participant profiles with no rtps tag (#3771)
7fa8e69 
* Refs #19315: Allow participant profiles with no rtps tag

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

* Refs #19315: Apply suggestions

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

* Refs #19315: Apply suggestions 2

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

---------

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
(cherry picked from commit 9bcd313)
EduPonz added a commit that referenced this pull request Aug 8, 2023
@EduPonz
Allow participant profiles with no rtps tag (#3771)
fa343d3 
* Refs #19315: Allow participant profiles with no rtps tag

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

* Refs #19315: Apply suggestions

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

* Refs #19315: Apply suggestions 2

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

---------

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
(cherry picked from commit 9bcd313)

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
EduPonz added a commit that referenced this pull request Aug 10, 2023
@mergify @EduPonz
Allow participant profiles with no rtps tag (#3771) (#3780)
85abd71 
* Refs #19315: Allow participant profiles with no rtps tag

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

* Refs #19315: Apply suggestions

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

* Refs #19315: Apply suggestions 2

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

---------

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
(cherry picked from commit 9bcd313)

Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
jimwang118 pushed a commit to jimwang118/Fast-DDS that referenced this pull request Aug 22, 2023
@EduPonz @jimwang118
Allow participant profiles with no rtps tag (eProsima#3771)
99a52fb 
* Refs #19315: Allow participant profiles with no rtps tag

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

* Refs #19315: Apply suggestions

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

* Refs #19315: Apply suggestions 2

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

---------

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
Signed-off-by: jimwang118 <wangzhijie05@beyondsoft.com>
JesusPoderoso pushed a commit that referenced this pull request Sep 6, 2023
@EduPonz @JesusPoderoso
Allow participant profiles with no rtps tag (#3771)
f7207b3 
* Refs #19315: Allow participant profiles with no rtps tag

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

* Refs #19315: Apply suggestions

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

* Refs #19315: Apply suggestions 2

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

---------

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
(cherry picked from commit 9bcd313)
JesusPoderoso pushed a commit that referenced this pull request Sep 6, 2023
@EduPonz @JesusPoderoso
Allow participant profiles with no rtps tag (#3771)
d975719 
* Refs #19315: Allow participant profiles with no rtps tag

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

* Refs #19315: Apply suggestions

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

* Refs #19315: Apply suggestions 2

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

---------

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
(cherry picked from commit 9bcd313)
EduPonz added a commit that referenced this pull request Sep 9, 2023
@mergify @EduPonz
Allow participant profiles with no rtps tag (#3771) (#3781)
c27a563 
* Refs #19315: Allow participant profiles with no rtps tag

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

* Refs #19315: Apply suggestions

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

* Refs #19315: Apply suggestions 2

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

---------

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
(cherry picked from commit 9bcd313)

Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
EduPonz added a commit that referenced this pull request Oct 2, 2023
@mergify @EduPonz
Allow participant profiles with no rtps tag (#3771) (#3779)
514cdf8 
* Refs #19315: Allow participant profiles with no rtps tag



* Refs #19315: Apply suggestions



* Refs #19315: Apply suggestions 2



---------


(cherry picked from commit 9bcd313)

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@richiware richiware richiware approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v2.12.0
Development

Successfully merging this pull request may close these issues.
2 participants
@EduPonz @richiware