Fixes on XML schema (#3534)

* Include recently added XML supported tags in the schema Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Fix QoS for Data Reader Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Update testing XML Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> --------- Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
eProsima · May 25, 2023 · 81cd998 · 81cd998
1 parent c00a854
commit 81cd998
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 15 deletions.
diff --git a/resources/xsd/fastRTPS_profiles.xsd b/resources/xsd/fastRTPS_profiles.xsd
@@ -1120,37 +1120,37 @@
         ├ destination_order           [0~1] NOT SUPPORTED YET: COMMENTED,
         ├ disablePositiveAcks         [0~1],
         ├ durability                  [0~1],
-        ├ durability_service          [0~1] NOT SUPPORTED YET: COMMENTED,
+        ├ durabilityService           [0~1] NOT SUPPORTED YET: COMMENTED,
         ├ entity_factory              [0~1] NOT SUPPORTED YET: COMMENTED,
         ├ groupData                   [0~1],
         ├ latencyBudget               [0~1],
         ├ lifespan                    [0~1],
         ├ liveliness                  [0~1],
         ├ ownership                   [0~1],
-        ├ ownershipStrength           [0~1],
         ├ partition                   [0~1],
         ├ presentation                [0~1] NOT SUPPORTED YET: COMMENTED,
         ├ reliability                 [0~1],
+        ├ timeBasedFilter             [0~1],
         ├ topicData                   [0~1],
         └ userData                    [0~1] -->
     <xs:complexType name="dataReaderQosPoliciesType">
         <xs:all>
             <xs:element name="data_sharing" type="dataSharingQosPolicyType" minOccurs="0" maxOccurs="1"/>
             <xs:element name="deadline" type="deadlineQosPolicyType" minOccurs="0" maxOccurs="1"/>
-            <!-- <xs:element name="destination_order" type="destinationOrderQosPolicyType" minOccurs="0" maxOccurs="1"/> -->
+            <xs:element name="destination_order" type="destinationOrderQosPolicyType" minOccurs="0" maxOccurs="1"/>
             <xs:element name="disablePositiveAcks" type="disablePositiveAcksQosPolicyType" minOccurs="0" maxOccurs="1"/>
             <xs:element name="durability" type="durabilityQosPolicyType" minOccurs="0" maxOccurs="1"/>
-            <!-- <xs:element name="durability_service" type="durabilityServiceQosPolicyType" minOccurs="0" maxOccurs="1"/> -->
+            <xs:element name="durabilityService" type="durabilityServiceQosPolicyType" minOccurs="0" maxOccurs="1"/>
             <!-- <xs:element name="entity_factory" type="entityFactoryQoSPolicyType" minOccurs="0" maxOccurs="1"/> -->
             <xs:element name="groupData" type="octectVectorQosPolicyType" minOccurs="0" maxOccurs="1"/>
             <xs:element name="latencyBudget" type="latencyBudgetQosPolicyType" minOccurs="0" maxOccurs="1"/>
             <xs:element name="lifespan" type="lifespanQosPolicyType" minOccurs="0" maxOccurs="1"/>
             <xs:element name="liveliness" type="livelinessQosPolicyType" minOccurs="0" maxOccurs="1"/>
             <xs:element name="ownership" type="ownershipQosPolicyType" minOccurs="0" maxOccurs="1"/>
-            <xs:element name="ownershipStrength" type="ownershipStrengthQosPolicyType" minOccurs="0" maxOccurs="1"/>
             <xs:element name="partition" type="partitionQosPolicyType" minOccurs="0" maxOccurs="1"/>
-            <!-- <xs:element name="presentation" type="presentationQosPolicyType" minOccurs="0" maxOccurs="1"/> -->
+            <xs:element name="presentation" type="presentationQosPolicyType" minOccurs="0" maxOccurs="1"/>
             <xs:element name="reliability" type="reliabilityQosPolicyType" minOccurs="0" maxOccurs="1"/>
+            <xs:element name="timeBasedFilter" type="timeBasedFilterQosPolicyType" minOccurs="0" maxOccurs="1"/>
             <xs:element name="topicData" type="octectVectorQosPolicyType" minOccurs="0" maxOccurs="1"/>
             <xs:element name="userData" type="octectVectorQosPolicyType" minOccurs="0" maxOccurs="1"/>
         </xs:all>

diff --git a/test/system/tools/xmlvalidation/all_profile.xml b/test/system/tools/xmlvalidation/all_profile.xml
@@ -644,16 +644,12 @@
                     <kind>EXCLUSIVE</kind>
                 </ownership>
 
-                <ownershipStrength>
-                    <value>50</value>
-                </ownershipStrength>
-
                 <latencyBudget>
                     <duration>
                         <sec>1</sec>
                     </duration>
                 </latencyBudget>
-                
+
                 <disablePositiveAcks>
                     <enabled>true</enabled>
                     <duration>

diff --git a/test/system/tools/xmlvalidation/dataReader_profile.xml b/test/system/tools/xmlvalidation/dataReader_profile.xml
@@ -60,10 +60,6 @@
                     <kind>EXCLUSIVE</kind>
                 </ownership>
 
-                <ownershipStrength>
-                    <value>50</value>
-                </ownershipStrength>
-
                 <latencyBudget>
                     <duration>
                         <sec>1</sec>