From 29b49b4346597c4aed439dd0d470d24b3426ed5e Mon Sep 17 00:00:00 2001
From: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
Date: Fri, 13 May 2022 08:55:31 +0200
Subject: [PATCH] XSD v3_23_0 baseline
Signed-off-by: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
---
CDT-commonTypes.xsd | 2 +-
CDT-enumerationTypes.xsd | 4 +
CDT-genericInterworkingOperationInstance.xsd | 90 --------------------
CDT-genericInterworkingService.xsd | 88 -------------------
CDT-notification.xsd | 2 +-
CDT-timeSeriesNotification.xsd | 42 +++++++++
6 files changed, 48 insertions(+), 180 deletions(-)
delete mode 100644 CDT-genericInterworkingOperationInstance.xsd
delete mode 100644 CDT-genericInterworkingService.xsd
create mode 100644 CDT-timeSeriesNotification.xsd
diff --git a/CDT-commonTypes.xsd b/CDT-commonTypes.xsd
index 06f430e..6319316 100644
--- a/CDT-commonTypes.xsd
+++ b/CDT-commonTypes.xsd
@@ -615,7 +615,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="sizeBelow" type="xs:positiveInteger" minOccurs="0" />
<xs:element name="operationMonitor" type="m2m:operationMonitor" minOccurs="0" maxOccurs="unbounded" />
<xs:element name="attribute" type="m2m:attributeList" minOccurs="0" maxOccurs="1" />
- <xs:element name="notificationEventType" type="m2m:notificationEventType" minOccurs="0" maxOccurs="6" />
+ <xs:element name="notificationEventType" type="m2m:notificationEventType" minOccurs="0" maxOccurs="5" />
<xs:element name="childResourceType" minOccurs="0" maxOccurs="1" >
<xs:simpleType>
<xs:restriction>
diff --git a/CDT-enumerationTypes.xsd b/CDT-enumerationTypes.xsd
index 51a7980..fa29989 100644
--- a/CDT-enumerationTypes.xsd
+++ b/CDT-enumerationTypes.xsd
@@ -818,6 +818,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="3" />
<!-- Trigger Payload -->
<xs:enumeration value="4" />
+ <!-- Timeseries notification -->
+ <xs:enumeration value="5" />
</xs:restriction>
</xs:simpleType>
@@ -842,6 +844,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="6" />
<!-- Blocking_Update -->
<xs:enumeration value="7" />
+ <!-- Report_on_Missing_Data_Points -->
+ <xs:enumeration value="8" />
</xs:restriction>
</xs:simpleType>
diff --git a/CDT-genericInterworkingOperationInstance.xsd b/CDT-genericInterworkingOperationInstance.xsd
deleted file mode 100644
index a133a98..0000000
--- a/CDT-genericInterworkingOperationInstance.xsd
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices
-contained in the original materials on any copies of the materials and that you comply strictly with these terms.
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations.
-No recommendation as to products or vendors is made or should be implied.
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
- xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:include schemaLocation="CDT-commonTypes.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor.xsd" />
- <xs:include schemaLocation="CDT-subscription.xsd" />
-
- <xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
- <xs:complexType>
- <xs:complexContent>
- <!-- Inherit common attributes for announceable Resources -->
- <xs:extension base="m2m:flexContainerResource">
- <xs:sequence>
- <!-- Resource Specific Attributes -->
- <xs:element name="operationName" type="xs:string" />
- <xs:element name="operationState" type="xs:string" />
- <xs:element name="inputDataPointLinks" type="m2m:listOfDataLinks" minOccurs="0" />
- <xs:element name="outputDataPointLinks" type="m2m:listOfDataLinks" minOccurs="0" />
- <xs:element name="inputLinks" type="m2m:listOfDataLinks" minOccurs="0" />
- <xs:element name="outputLinks" type="m2m:listOfDataLinks" minOccurs="0" />
-
- <!-- Child Resources -->
- <xs:choice minOccurs="0" maxOccurs="1">
- <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
- <xs:choice minOccurs="1" maxOccurs="unbounded">
- <xs:element ref="m2m:semanticDescriptor" />
- <xs:element ref="m2m:subscription" />
- </xs:choice>
- </xs:choice>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
-
-
- <xs:element name="genericInterworkingOperationInstanceAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource">
- <xs:complexType>
- <xs:complexContent>
- <!-- Inherit common attributes for announced Resources -->
- <xs:extension base="m2m:announcedFlexContainerResource">
- <xs:sequence>
- <!-- Resource Specific Attributes -->
- <xs:element name="operationName" type="xs:string" minOccurs="0" />
- <xs:element name="operationState" type="xs:string" minOccurs="0" />
- <xs:element name="inputDataPointLinks" type="m2m:listOfDataLinks" minOccurs="0" />
- <xs:element name="outputDataPointLinks" type="m2m:listOfDataLinks" minOccurs="0" />
- <xs:element name="inputLinks" type="m2m:listOfDataLinks" minOccurs="0" />
- <xs:element name="outputLinks" type="m2m:listOfDataLinks" minOccurs="0" />
-
- <!-- Child Resources -->
- <xs:choice minOccurs="0" maxOccurs="1">
- <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
- <xs:choice minOccurs="1" maxOccurs="unbounded">
- <xs:element ref="m2m:semanticDescriptor" />
- <xs:element ref="m2m:semanticDescriptorAnnc" />
- <xs:element ref="m2m:subscription" />
- </xs:choice>
- </xs:choice>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
-</xs:schema>
diff --git a/CDT-genericInterworkingService.xsd b/CDT-genericInterworkingService.xsd
deleted file mode 100644
index 82ddcad..0000000
--- a/CDT-genericInterworkingService.xsd
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices
-contained in the original materials on any copies of the materials and that you comply strictly with these terms.
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
-© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations.
-No recommendation as to products or vendors is made or should be implied.
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
- xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:include schemaLocation="CDT-commonTypes.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor.xsd" />
- <xs:include schemaLocation="CDT-subscription.xsd" />
- <xs:include schemaLocation="CDT-genericInterworkingOperationInstance.xsd" />
-
- <xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
- <xs:complexType>
- <xs:complexContent>
- <!-- Inherit common attributes for announceable Resources -->
- <xs:extension base="m2m:flexContainerResource">
- <xs:sequence>
- <!-- Resource Specific Attributes -->
- <xs:element name="serviceName" type="xs:string" />
- <xs:element name="inputDataPointLinks" type="m2m:listOfDataLinks" minOccurs="0" />
- <xs:element name="outputDataPointLinks" type="m2m:listOfDataLinks" minOccurs="0" />
-
- <!-- Child Resources -->
- <xs:choice minOccurs="0" maxOccurs="1">
- <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="m2m:genericInterworkingService" />
- <xs:element ref="m2m:genericInterworkingOperationInstance" />
- <xs:element ref="m2m:semanticDescriptor" />
- <xs:element ref="m2m:subscription" />
- </xs:choice>
- </xs:choice>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="genericInterworkingServiceAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource">
- <xs:complexType>
- <xs:complexContent>
- <!-- Inherit common attributes for announced Resources -->
- <xs:extension base="m2m:announcedFlexContainerResource">
- <xs:sequence>
- <!-- Resource Specific Attributes -->
- <xs:element name="serviceName" type="xs:string" />
- <xs:element name="inputDataPointLinks" type="m2m:listOfDataLinks" minOccurs="0" />
- <xs:element name="outputDataPointLinks" type="m2m:listOfDataLinks" minOccurs="0" />
-
- <!-- Child Resources -->
- <xs:choice minOccurs="0" maxOccurs="1">
- <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="m2m:genericInterworkingServiceAnnc" />
- <xs:element ref="m2m:genericInterworkingOperationInstanceAnnc" />
- <xs:element ref="m2m:semanticDescriptor" />
- <xs:element ref="m2m:semanticDescriptorAnnc" />
- <xs:element ref="m2m:subscription" />
- </xs:choice>
- </xs:choice>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
-</xs:schema>
diff --git a/CDT-notification.xsd b/CDT-notification.xsd
index b9de3ec..aa6e928 100644
--- a/CDT-notification.xsd
+++ b/CDT-notification.xsd
@@ -52,7 +52,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="notificationEventType" type="m2m:notificationEventType" minOccurs="0"/>
+ <xs:element name="notificationEventType" type="m2m:notificationEventType"/>
</xs:sequence>
</xs:complexType>
</xs:element>
diff --git a/CDT-timeSeriesNotification.xsd b/CDT-timeSeriesNotification.xsd
new file mode 100644
index 0000000..d193b1e
--- /dev/null
+++ b/CDT-timeSeriesNotification.xsd
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, or any components thereof, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+© 2021, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+Notice of Disclaimer & Limitation of Liability
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand
+and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations.
+No recommendation as to products or vendors is made or should be implied.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
+ xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:include schemaLocation="CDT-commonTypes.xsd" />
+
+ <xs:element name="timeSeriesNotification">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="missingDataList" type="m2m:missingDataList"/>
+ <xs:element name="missingDataCurrentNr" type="xs:nonNegativeInteger"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+</xs:schema>
+
--
GitLab