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

Add XSD for static discovery [17842] #3404

Merged
merged 5 commits into from
Jun 22, 2023
Merged

Conversation

richiware
Copy link
Member

@richiware richiware commented Mar 27, 2023

Description

This PR adds a new resources: an XSD file to validates static discovery XML files.

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
  • N/A Any new/modified methods have been properly documented using Doxygen.
  • Changes are ABI compatible.
  • Changes are API compatible.
  • 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.
  • N/A 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.

@JLBuenoLopez JLBuenoLopez added this to the v2.10.1 milestone Mar 27, 2023
@richiware richiware changed the title Add XSD for static discovery Add XSD for static discovery [17842] Mar 27, 2023
@richiware richiware force-pushed the feature/xsd-static-discovery branch from 287245b to a3dc386 Compare March 28, 2023 14:00
@EduPonz EduPonz modified the milestones: v2.10.1, v2.10.2 Mar 31, 2023
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.

It would be desirable to have the following milestones to merge this pull request:

  • Install this schema as the profiles XSD done in src/fastrtps/CMakeLists.txt line 542
  • Include system test as the profiles XSD done in src/fastrtps/test/system/tools/fastdds/CMakeLists.txt with all xml documents with the sufix *_static_disc.xml, and include it in the tests.py file

Note: the CLI command fastdds xml validate would be used. It automatically uses the profiles schema, but adding -x path/to/installed/static_discovery/schema.xsd would validate the given *_static_disc.xml files against the given schema.

@JesusPoderoso JesusPoderoso added the in progress Issue or PR which is being reviewed label May 18, 2023
@JLBuenoLopez JLBuenoLopez modified the milestones: v2.10.2, v2.11.0 Jun 12, 2023
@JesusPoderoso JesusPoderoso added ci-pending PR which CI is running and removed in progress Issue or PR which is being reviewed labels Jun 20, 2023
Copy link
Contributor

@JLBuenoLopez JLBuenoLopez left a comment

Choose a reason for hiding this comment

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

Blackbox tests include some XML files that require a previous CMake configuration (for instance test/blackbox/PubSubreader_static_disc.xml.in). It would be nice to configure and validate them as well.

@JesusPoderoso
Copy link
Contributor

@richiprosima please test this

JLBuenoLopez
JLBuenoLopez previously approved these changes Jun 21, 2023
Copy link
Contributor

@JLBuenoLopez JLBuenoLopez 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 previously approved these changes Jun 21, 2023
@JesusPoderoso
Copy link
Contributor

@richiprosima Please test windows

@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 Jun 21, 2023
@EduPonz EduPonz added conflicts Backport PR wich git cherry pick failed versions-pending and removed ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. conflicts Backport PR wich git cherry pick failed labels Jun 22, 2023
@JesusPoderoso JesusPoderoso added the skip-ci Automatically pass CI label Jun 22, 2023
@JesusPoderoso JesusPoderoso dismissed stale reviews from JLBuenoLopez and themself via b3f8b13 June 22, 2023 06:26
@JesusPoderoso JesusPoderoso added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed versions-pending labels Jun 22, 2023
@EduPonz EduPonz merged commit 906e0a1 into master Jun 22, 2023
@EduPonz EduPonz deleted the feature/xsd-static-discovery branch June 22, 2023 07:27
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. skip-ci Automatically pass CI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants