From 6cfdf8b3615ccd359f86bcfb2e0ea00d3104547f Mon Sep 17 00:00:00 2001
From: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
Date: Tue, 17 May 2022 23:30:43 +0200
Subject: [PATCH] SDS-2020-0130R08 -
TS-0004-primitiveProfile_resources_parameters_R4
Signed-off-by: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
---
CDT-AE.xsd | 3 ++
CDT-CSEBase.xsd | 2 +
CDT-commonTypes.xsd | 25 ++++++++++-
CDT-enumerationTypes.xsd | 32 +++++++++++++-
CDT-primitiveProfile.xsd | 94 ++++++++++++++++++++++++++++++++++++++++
CDT-remoteCSE.xsd | 7 ++-
CDT-requestPrimitive.xsd | 2 +
CDT-schedule.xsd | 4 +-
CDT-subscription.xsd | 1 +
9 files changed, 165 insertions(+), 5 deletions(-)
create mode 100644 CDT-primitiveProfile.xsd
diff --git a/CDT-AE.xsd b/CDT-AE.xsd
index d687c07..021b17c 100644
--- a/CDT-AE.xsd
+++ b/CDT-AE.xsd
@@ -43,6 +43,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-e2eQosSession.xsd" />
<xs:include schemaLocation="CDT-timeSyncBeacon.xsd" />
<xs:include schemaLocation="CDT-nwMonitoringReq.xsd" />
+ <xs:include schemaLocation="CDT-primitiveProfile.xsd" />
<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
@@ -91,6 +92,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:e2eQosSession" />
<xs:element ref="m2m:timeSyncBeacon" />
<xs:element ref="m2m:nwMonitoringReq" />
+ <xs:element ref="m2m:primitiveProfile" />
</xs:choice>
</xs:choice>
</xs:sequence>
@@ -149,6 +151,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:transaction" />
<xs:element ref="m2m:e2eQosSession" />
<xs:element ref="m2m:nwMonitoringReq" />
+ <xs:element ref="m2m:primitiveProfile" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/CDT-CSEBase.xsd b/CDT-CSEBase.xsd
index 6c94d3e..8035e00 100644
--- a/CDT-CSEBase.xsd
+++ b/CDT-CSEBase.xsd
@@ -62,6 +62,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-e2eQosSession.xsd" />
<xs:include schemaLocation="CDT-timeSyncBeacon.xsd" />
<xs:include schemaLocation="CDT-nwMonitoringReq.xsd" />
+ <xs:include schemaLocation="CDT-primitiveProfile.xsd" />
<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
<xs:complexType>
@@ -127,6 +128,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:e2eQosSession" />
<xs:element ref="m2m:timeSyncBeacon" />
<xs:element ref="m2m:nwMonitoringReq" />
+ <xs:element ref="m2m:primitiveProfile" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/CDT-commonTypes.xsd b/CDT-commonTypes.xsd
index dff6bfd..16d68df 100644
--- a/CDT-commonTypes.xsd
+++ b/CDT-commonTypes.xsd
@@ -359,7 +359,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:simpleType name="scheduleEntry">
<xs:restriction base="xs:string">
- <xs:pattern value="(((([*]|(([1-5]?\d)\-([1-5]?\d)))(\/([1-5]?\d))?|([1-5]?\d))\,)*((([*]|(([1-5]?\d)\-([1-5]?\d)))(\/([1-5]?\d))?)|([1-5]?\d))\s+){2}((([*]|((1?\d|2[0-3])\-(1?\d|2[0-3])))(\/1?\d|2[0-3])?|(1?\d|2[0-3]))\,)*((([*]|((1?\d|2[0-3])\-(1?\d|2[0-3])))(\/1?\d|2[0-3])?)|(1?\d|2[0-3]))\s+((([*]|(([1-9]|1\d|2\d|3[01])\-([1-9]|1\d|2\d|3[01])))(\/[1-9]|1\d|2\d|3[01])?|([1-9]|1\d|2\d|3[01]))\,)*((([*]|(([1-9]|1\d|2\d|3[01])\-([1-9]|1\d|2\d|3[01])))(\/[1-9]|1\d|2\d|3[01])?)|([1-9]|1\d|2\d|3[01]))\s+((([*]|(([1-9]|1[0-2])\-([1-9]|1[0-2])))(\/[1-9]|1[0-2])?|([1-9]|1[0-2]))\,)*((([*]|(([1-9]|1[0-2])\-([1-9]|1[0-2])))(\/[1-9]|1[0-2])?)|([1-9]|1[0-2]))\s+((([*]|(([0-6])\-([0-6])))(\/[0-6])?|([0-6]))\,)*((([*]|(([0-6])\-([0-6])))(\/[0-6])?)|([0-6]))\s+((([*]|(([2-9]\d\d\d)\-([2-9]\d\d\d)))(\/\d?\d?\d?\d)?|([2-9]\d\d\d))\,)*((([*]|(([2-9]\d\d\d)\-([2-9]\d\d\d)))(\/\d?\d?\d?\d)?)|([2-9]\d\d\d))" /> </xs:restriction>
+ <xs:pattern value="(((([*]|(([1-5]?\d)-([1-5]?\d)))(/([1-5]?\d))?|([1-5]?\d)),)*((([*]|(([1-5]?\d)-([1-5]?\d)))(/([1-5]?\d))?)|([1-5]?\d))\s+){2}(((([*]|((1?\d|2[0-3])-(1?\d|2[0-3])))(/1?\d|2[0-3])?|(1?\d|2[0-3])),)*((([*]|((1?\d|2[0-3])-(1?\d|2[0-3])))(/1?\d|2[0-3])?)|(1?\d|2[0-3]))\s+)(((([*]|(([1-9]|1\d|2\d|3[01])-([1-9]|1\d|2\d|3[01])))(/[1-9]|1\d|2\d|3[01])?|([1-9]|1\d|2\d|3[01])),)*((([*]|(([1-9]|1\d|2\d|3[01])-([1-9]|1\d|2\d|3[01])))(/[1-9]|1\d|2\d|3[01])?)|([1-9]|1\d|2\d|3[01]))\s+)(((([*]|(([1-9]|1[0-2])-([1-9]|1[0-2])))(/[1-9]|1[0-2])?|([1-9]|1[0-2])),)*((([*]|(([1-9]|1[0-2])-([1-9]|1[0-2])))(/[1-9]|1[0-2])?)|([1-9]|1[0-2]))\s+)(((([*]|(([0-6])-([0-6])))(/[0-6])?|([0-6])),)*((([*]|(([0-6])-([0-6])))(/[0-6])?)|([0-6]))\s+)(((([*]|(([2-9]\d\d\d)-([2-9]\d\d\d)))(/\d?\d?\d?\d)?|([2-9]\d\d\d)),)*((([*]|(([2-9]\d\d\d)-([2-9]\d\d\d)))(/\d?\d?\d?\d)?)|([2-9]\d\d\d)))" /> </xs:restriction>
</xs:simpleType>
<xs:simpleType name="listOfURIs">
@@ -522,6 +522,15 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
+ <xs:simpleType name="listOfOperations">
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="m2m:operation" />
+ </xs:simpleType>
+ <xs:minLength value="1" />
+ </xs:restriction>
+ </xs:simpleType>
+
<xs:simpleType name="resourceList" >
<xs:list itemType="xs:anyURI" />
</xs:simpleType>
@@ -622,6 +631,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="ontologyMappingResources" type="m2m:listOfM2MID" minOccurs="0"/>
<xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/>
<xs:element name="vendorInformation" type="xs:string" minOccurs="0"/>
+ <xs:element name="primitiveProfileIdentifier" type="xs:anyURI" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
@@ -1457,6 +1467,19 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:sequence>
</xs:complexType>
+ <xs:complexType name="listOfAttributes">
+ <xs:sequence>
+ <xs:element name="attribute" minOccurs="1" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="name" type="xs:NCName"/>
+ <xs:element name="value" type="xs:anyType" minOccurs="0" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
<!-- Resource type definitions. These types include the "common attributes" that are used by oneM2M Resources. Each oneM2M
Resource has a resource type that is defined in a separate schema, but each resource type extends one of the types that is
defined below -->
diff --git a/CDT-enumerationTypes.xsd b/CDT-enumerationTypes.xsd
index 2eaa4ab..3b19c5a 100644
--- a/CDT-enumerationTypes.xsd
+++ b/CDT-enumerationTypes.xsd
@@ -153,6 +153,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="60" />
<!-- nwMonitoringReq -->
<xs:enumeration value="61" />
+ <!-- primitiveProfile -->
+ <xs:enumeration value="62" />
<!-- accessControlPolicyAnnc -->
<xs:enumeration value="10001" />
<!-- AEAnnc -->
@@ -206,6 +208,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="10057" />
<!-- timeSyncBeaconAnnc -->
<xs:enumeration value="10060" />
+ <!-- primitiveProfileAnnc -->
+ <xs:enumeration value="10062" />
</xs:restriction>
</xs:simpleType>
@@ -674,7 +678,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="60" />
<!-- nwMonitoringReq -->
<xs:enumeration value="61" />
- <!-- accessControlPolicyAnnc -->
+ <!-- primitiveProfile -->
+ <xs:enumeration value="62" />
+ <!-- accessControlPolicyAnnc -->
<xs:enumeration value="10001" />
<!-- AEAnnc -->
<xs:enumeration value="10002" />
@@ -729,6 +735,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="10057" />
<!-- timeSyncBeaconAnnc -->
<xs:enumeration value="10060" />
+ <!-- primitiveProfileAnnc -->
+ <xs:enumeration value="10062" />
<!-- oldest -->
<xs:enumeration value="20001" />
<!-- latest -->
@@ -2001,5 +2009,27 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
+ <xs:simpleType name="primitiveProfileApplicability">
+ <xs:annotation>
+ <xs:documentation>Used for the applicability attribute of the primitiveProfile resource</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:integer">
+ <!-- REQUESTS_TO_CSE -->
+ <xs:enumeration value="1" />
+ <!-- RESPONSES_FROM_CSE -->
+ <xs:enumeration value="2" />
+ <!-- REQUESTS_TO_CSE AND RESPONSES_FROM_CSE-->
+ <xs:enumeration value="3" />
+ <!-- NOTIFICATIONS_FROM_CSE -->
+ <xs:enumeration value="4" />
+ <!-- REQUESTS_TO_CSE AND NOTIFICATIONS_FROM_CSE -->
+ <xs:enumeration value="5" />
+ <!-- RESPONSES_FROM_CSE AND NOTIFICATIONS_FROM_CSE -->
+ <xs:enumeration value="6" />
+ <!-- REQUESTS_TO_CSE AND RESPONSES_FROM_CSE AND NOTIFICATIONS_FROM_CSE -->
+ <xs:enumeration value="7" />
+ </xs:restriction>
+ </xs:simpleType>
+
</xs:schema>
diff --git a/CDT-primitiveProfile.xsd b/CDT-primitiveProfile.xsd
new file mode 100644
index 0000000..c31d839
--- /dev/null
+++ b/CDT-primitiveProfile.xsd
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, 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.
+© 2016, 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-subscription.xsd" />
+ <xs:include schemaLocation="CDT-transaction.xsd"/>
+
+ <xs:element name="primitiveProfile" substitutionGroup="m2m:sg_announceableResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit common attributes for announceable Resources -->
+ <xs:extension base="m2m:announceableResource">
+ <xs:sequence>
+ <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
+
+ <!-- Resource Specific Attributes -->
+ <xs:element name="IDList" type="m2m:listOfM2MID"/>
+ <xs:element name="resourceTypes" type="m2m:resourceTypeList" minOccurs="0" />
+ <xs:element name="operations" type="m2m:listOfOperations" minOccurs="0" />
+ <xs:element name="resourceIDs" type="m2m:listOfURIs" minOccurs="0" />
+ <xs:element name="releaseVersions" type="m2m:supportedReleaseVersions" minOccurs="0" />
+ <xs:element name="additions" type="m2m:listOfAttributes" minOccurs="0" />
+ <xs:element name="deletions" type="m2m:attributeList" minOccurs="0" />
+ <xs:element name="applicability" type="m2m:primitiveProfileApplicability" 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:subscription" />
+ <xs:element ref="m2m:transaction" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="primitiveProfileAnnc" substitutionGroup="m2m:sg_announcedResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit common attributes for announceable Resources -->
+ <xs:extension base="m2m:announcedResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+ <xs:element name="IDList" type="m2m:listOfM2MID" minOccurs="0" />
+ <xs:element name="resourceTypes" type="m2m:resourceTypeList" minOccurs="0" />
+ <xs:element name="operations" type="m2m:listOfOperations" minOccurs="0" />
+ <xs:element name="resourceIDs" type="m2m:listOfURIs" minOccurs="0" />
+ <xs:element name="releaseVersions" type="m2m:supportedReleaseVersions" minOccurs="0" />
+ <xs:element name="additions" type="m2m:listOfAttributes" minOccurs="0" />
+ <xs:element name="deletions" type="m2m:attributeList" minOccurs="0" />
+ <xs:element name="applicability" type="m2m:primitiveProfileApplicability" 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:subscription" />
+ <xs:element ref="m2m:transaction" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
diff --git a/CDT-remoteCSE.xsd b/CDT-remoteCSE.xsd
index 5bac0b8..7400f67 100644
--- a/CDT-remoteCSE.xsd
+++ b/CDT-remoteCSE.xsd
@@ -45,7 +45,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-e2eQosSession.xsd" />
<xs:include schemaLocation="CDT-timeSyncBeacon.xsd" />
<xs:include schemaLocation="CDT-nwMonitoringReq.xsd" />
-
+ <xs:include schemaLocation="CDT-primitiveProfile.xsd" />
+
<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
<xs:complexContent>
@@ -104,6 +105,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:timeSyncBeacon" />
<xs:element ref="m2m:timeSyncBeaconAnnc" />
<xs:element ref="m2m:nwMonitoringReq" />
+ <xs:element ref="m2m:primitiveProfile" />
+ <xs:element ref="m2m:primitiveProfileAnnc" />
</xs:choice>
</xs:choice>
</xs:sequence>
@@ -164,6 +167,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:transaction" />
<xs:element ref="m2m:e2eQosSession" />
<xs:element ref="m2m:nwMonitoringReq" />
+ <xs:element ref="m2m:primitiveProfile" />
+ <xs:element ref="m2m:primitiveProfileAnnc" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/CDT-requestPrimitive.xsd b/CDT-requestPrimitive.xsd
index 1d2a563..c72aaef 100644
--- a/CDT-requestPrimitive.xsd
+++ b/CDT-requestPrimitive.xsd
@@ -134,6 +134,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/>
<!-- parameter "Vendor Information" -->
<xs:element name="vendorInformation" type="xs:string" minOccurs="0"/>
+ <!-- parameter "Primitive Profile Identifier" -->
+ <xs:element name="primitiveProfileIdentifier" type="xs:anyURI" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
</xs:element>
diff --git a/CDT-schedule.xsd b/CDT-schedule.xsd
index b528c0b..ab9d757 100644
--- a/CDT-schedule.xsd
+++ b/CDT-schedule.xsd
@@ -30,10 +30,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes.xsd" />
<xs:include schemaLocation="CDT-subscription.xsd" />
- <xs:element name="schedule" substitutionGroup="m2m:sg_announceableResource ">
+ <xs:element name="schedule" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
<xs:complexContent>
- <xs:extension base="m2m:announceableResource ">
+ <xs:extension base="m2m:announceableResource">
<xs:sequence>
<!-- Resource Specific Attributes -->
<xs:element name="scheduleElement" type="m2m:scheduleEntries" />
diff --git a/CDT-subscription.xsd b/CDT-subscription.xsd
index 7478440..4ff6bec 100644
--- a/CDT-subscription.xsd
+++ b/CDT-subscription.xsd
@@ -58,6 +58,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="associatedCrossResourceSub" type="m2m:listOfURIs" minOccurs="0" />
<xs:element name="notificationStatsEnable" type="xs:boolean"/>
<xs:element name="notificationStatsInfo" type="m2m:setOfNotificationStatsInfo" minOccurs="0" />
+ <xs:element name="primitiveProfileID" type="m2m:ID" minOccurs="0" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
--
GitLab