Commit ef668ca5 authored by Peter Niblett's avatar Peter Niblett
Browse files

updates to match 0661

parent d4a2ee34
...@@ -27,40 +27,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -27,40 +27,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-enumerationTypes-v0_8_0.xsd" /> <xs:include schemaLocation="CDT-enumerationTypes-v0_8_0.xsd" />
<xs:simpleType name="timestamp"> <!-- oneM2M Simple Types -->
<xs:restriction base="xs:dateTime" />
</xs:simpleType>
<!-- TODO: Fix these -->
<xs:simpleType name="eventCat">
<xs:union memberTypes="m2m:stdEventCats " />
</xs:simpleType>
<xs:simpleType name="eventCatWithDef">
<xs:union memberTypes="m2m:eventCat " />
</xs:simpleType>
<xs:simpleType name="listOfEventCat">
<list itemType="m2m:eventCat" />
</xs:simpleType>
<xs:simpleType name="listOfEventCatwithDef"> <!-- TODO: Choose appropriate definitions for the id types (xs:token is placeholder for now) -->
<list itemType="m2m:eventCatWithDef" />
</xs:simpleType>
<xs:simpleType name="extendedCrontab">
<xs:restriction base="xs:string">
<xs:pattern
value="([*\d/,-]+\s+){3}[*\d/#L,-]+\s+(JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC|[*\d/,-])+\s+(SUN|MON|TUE|WED|THU|FRI|SAT|[*\dL#/,-])+\s+[*\d/,-]+" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="eCrontabList">
<xs:list itemType="m2m:extendedCrontab" />
</xs:simpleType>
<!-- TODO: sort out id vs ID, and choose appropriate definitions for the id types (xs:token is placeholder for now) -->
<xs:simpleType name="ID"> <xs:simpleType name="ID">
<xs:restriction base="xs:token"> <xs:restriction base="xs:token">
</xs:restriction> </xs:restriction>
...@@ -79,6 +49,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -79,6 +49,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
<xs:complexType name="externalId">
<xs:simpleContent>
<xs:extension base="xs:anyURI">
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<xs:simpleType name="requestID"> <xs:simpleType name="requestID">
<xs:restriction base="xs:token"> <xs:restriction base="xs:token">
...@@ -102,24 +78,117 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -102,24 +78,117 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:list itemType="xs:string" /> <xs:list itemType="xs:string" />
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="stringList"> <!-- TODO: Not sure who uses this -->
<xs:list itemType="xs:string" /> <xs:simpleType name="networkaccessID">
<xs:restriction base="xs:token">
</xs:restriction>
</xs:simpleType>
<!-- TODO: check if m2m:ID is the correct data type for the following list elements or if xs:anyURI should be used (as used
in access control rules) -->
<!-- "listOfM2MID" is a space separated list of CSE-IDs and/or AE-IDs (i.e. elements of data type m2m:ID" -->
<xs:simpleType name="listOfM2MID">
<xs:list itemType="m2m:ID" />
</xs:simpleType>
<!-- TODO: Fix these -->
<xs:simpleType name="eventCat">
<xs:union memberTypes="m2m:stdEventCats " />
</xs:simpleType>
<xs:simpleType name="eventCatWithDef">
<xs:union memberTypes="m2m:eventCat " />
</xs:simpleType>
<xs:simpleType name="listOfEventCat">
<list itemType="m2m:eventCat" />
</xs:simpleType>
<xs:simpleType name="listOfEventCatwithDef">
<list itemType="m2m:eventCatWithDef" />
</xs:simpleType>
<!-- TODO: check if the definition of "listOfMinMax" can be simplified, i.e. avoiding use of explicit type definitions for
"longMin-1" and "listOflongMin-1" -->
<!-- "listOfMinMax" represents a list of min and max numbers used in attributes of the [cmdhLimits] resource based on data
type longMin-1. Unit is milliseconds -->
<xs:simpleType name="longMin-1">
<xs:restriction base="xs:long">
<xs:minInclusive value="-1" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="listOflongMin-1">
<xs:list itemType="m2m:longMin-1" />
</xs:simpleType>
<xs:simpleType name="listOfMinMax">
<xs:restriction base="m2m:listOflongMin-1">
<xs:minLength value="2" />
<xs:maxLength value="2" />
</xs:restriction>
</xs:simpleType>
<!-- TODO: check if the definition of "backOffParameters" can be simplified, i.e. avoiding use of explicit type definition
for "listOfNonNegInt" -->
<!-- "backOffParameters" is an ordered list of 3 nonNegativeInteger numbers:backoffTime, backoffTimeIncrement, maximumBackoffTime
(in that order!), all units in milliseconds -->
<xs:simpleType name="listOfNonNegInt">
<xs:list itemType="xs:nonNegativeInteger" />
</xs:simpleType>
<xs:simpleType name="backOffParameters">
<xs:restriction base="m2m:listOfNonNegInt">
<xs:minLength value="3" />
<xs:maxLength value="3" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="ipv4">
<xs:restriction base="xs:token" />
</xs:simpleType>
<xs:simpleType name="ipv6">
<xs:restriction base="xs:token" />
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="pOAList"> <xs:simpleType name="pOAList">
<xs:list itemType="xs:string" /> <xs:list itemType="xs:string" />
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="timestamp">
<xs:restriction base="xs:dateTime" />
</xs:simpleType>
<xs:simpleType name="typeOfContent">
<xs:restriction base="xs:token" />
</xs:simpleType>
<xs:simpleType name="contentInfo">
<xs:restriction base="xs:token" />
</xs:simpleType>
<xs:simpleType name="scheduleEntry">
<xs:restriction base="xs:string">
<xs:pattern
value="([*\d/,-]+\s+){3}[*\d/#L,-]+\s+(JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC|[*\d/,-])+\s+(SUN|MON|TUE|WED|THU|FRI|SAT|[*\dL#/,-])+\s+[*\d/,-]+" />
</xs:restriction>
</xs:simpleType>
<!-- <xs:simpleType name="stringList"> -->
<!-- <xs:list itemType="xs:string" /> -->
<!-- </xs:simpleType> -->
<xs:simpleType name="triggerRecipientId"> <xs:simpleType name="triggerRecipientId">
<xs:restriction base="xs:unsignedInt" /> <xs:restriction base="xs:unsignedInt" />
</xs:simpleType> </xs:simpleType>
<xs:complexType name="externalId">
<xs:simpleContent>
<xs:extension base="xs:anyURI">
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<xs:simpleType name="listOfURIs"> <xs:simpleType name="listOfURIs">
<list itemType="xs:anyURI" /> <list itemType="xs:anyURI" />
...@@ -439,48 +508,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -439,48 +508,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType> </xs:complexType>
<!-- TODO: check if m2m:ID is the correct data type for the following list elements or if xs:anyURI should be used (as used
in access control rules) -->
<!-- "listOfM2MID" is a space separated list of CSE-IDs and/or AE-IDs (i.e. elements of data type m2m:ID" -->
<xs:simpleType name="listOfM2MID">
<xs:list itemType="m2m:ID" />
</xs:simpleType>
<!-- TODO: check if the definition of "listOfMinMax" can be simplified, i.e. avoiding use of explicit type definitions for
"longMin-1" and "listOflongMin-1" -->
<!-- "listOfMinMax" represents a list of min and max numbers used in attributes of the [cmdhLimits] resource based on data
type longMin-1. Unit is milliseconds -->
<xs:simpleType name="longMin-1">
<xs:restriction base="xs:long">
<xs:minInclusive value="-1" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="listOflongMin-1">
<xs:list itemType="m2m:longMin-1" />
</xs:simpleType>
<xs:simpleType name="listOfMinMax">
<xs:restriction base="m2m:listOflongMin-1">
<xs:minLength value="2" />
<xs:maxLength value="2" />
</xs:restriction>
</xs:simpleType>
<!-- TODO: check if the definition of "backOffParameters" can be simplified, i.e. avoiding use of explicit type definition
for "listOfNonNegInt" -->
<!-- "backOffParameters" is an ordered list of 3 nonNegativeInteger numbers:backoffTime, backoffTimeIncrement, maximumBackoffTime
(in that order!), all units in milliseconds -->
<xs:simpleType name="listOfNonNegInt">
<xs:list itemType="xs:nonNegativeInteger" />
</xs:simpleType>
<xs:simpleType name="backOffParameters">
<xs:restriction base="m2m:listOfNonNegInt">
<xs:minLength value="3" />
<xs:maxLength value="3" />
</xs:restriction>
</xs:simpleType>
<!-- "actionStatus" is used across mgmtObj resources --> <!-- "actionStatus" is used across mgmtObj resources -->
<xs:complexType name="actionStatus"> <xs:complexType name="actionStatus">
......
...@@ -70,7 +70,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -70,7 +70,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="18" /> <xs:enumeration value="18" />
<!-- serviceSubscribedAppRule --> <!-- serviceSubscribedAppRule -->
<xs:enumeration value="19" /> <xs:enumeration value="19" />
<!-- serviceSubscribedNode --> <!-- serviceSubscribedNode -->
<xs:enumeration value="20" /> <xs:enumeration value="20" />
<!-- statsCollect --> <!-- statsCollect -->
<xs:enumeration value="21" /> <xs:enumeration value="21" />
...@@ -137,9 +137,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -137,9 +137,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:restriction base="xs:integer"> <xs:restriction base="xs:integer">
<!-- Default --> <!-- Default -->
<xs:enumeration value="1" /> <xs:enumeration value="1" />
<!-- immediate --> <!-- Immediate -->
<xs:enumeration value="2" /> <xs:enumeration value="2" />
<!-- bestEffort --> <!-- BestEffort -->
<xs:enumeration value="3" /> <xs:enumeration value="3" />
<!-- Latest --> <!-- Latest -->
<xs:enumeration value="4" /> <xs:enumeration value="4" />
...@@ -165,26 +165,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -165,26 +165,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="accessControlOperation">
<xs:annotation>
<xs:documentation>Shall be considered for access control policy check by the CSE</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
<!-- Create -->
<xs:enumeration value="1" />
<!-- Retrieve -->
<xs:enumeration value="2" />
<!-- Update -->
<xs:enumeration value="3" />
<!-- Delete -->
<xs:enumeration value="4" />
<!-- Notify -->
<xs:enumeration value="5" />
<!-- Discover -->
<xs:enumeration value="6" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="responseType"> <xs:simpleType name="responseType">
<xs:annotation> <xs:annotation>
<xs:documentation>Used for rt parameter in request and operation attribute in &lt;request&gt; resource <xs:documentation>Used for rt parameter in request and operation attribute in &lt;request&gt; resource
...@@ -209,14 +189,18 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -209,14 +189,18 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="0" /> <xs:enumeration value="0" />
<!-- Attributes --> <!-- Attributes -->
<xs:enumeration value="1" /> <xs:enumeration value="1" />
<!-- Attributes + Child Resources --> <!-- Hierarchical Address -->
<xs:enumeration value="2" /> <xs:enumeration value="2" />
<!-- Attributes + Child Resource References --> <!-- Hierarchical Address + Attributes -->
<xs:enumeration value="3" /> <xs:enumeration value="3" />
<!-- Child Resources --> <!-- Attributes + Child Resources -->
<xs:enumeration value="4" /> <xs:enumeration value="4" />
<!-- Attributes + Child Resource References -->
<xs:enumeration value="5" />
<!-- Child Resource References -->
<xs:enumeration value="6" />
<!-- Original Resource --> <!-- Original Resource -->
<xs:enumeration value="5" /> <xs:enumeration value="7" />
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
...@@ -247,11 +231,18 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -247,11 +231,18 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- TODO: to be defined (needs CR) --> <!-- TODO: to be defined (needs CR) -->
<xs:simpleType name="requestStatus"> <xs:simpleType name="requestStatus">
<xs:annotation> <xs:annotation>
<xs:documentation></xs:documentation> <xs:documentation>Used for request Status in the &lt;request&gt; resource</xs:documentation>
</xs:annotation> </xs:annotation>
<xs:restriction base="xs:integer"> <xs:restriction base="xs:integer">
<xs:enumeration value="22" /> <!-- COMPLETED -->
</xs:restriction> <xs:enumeration value="1" />
<!-- FAILED -->
<xs:enumeration value="2" />
<!-- PENDING -->
<xs:enumeration value="3" />
<!-- FORWARDED -->
<xs:enumeration value="4" />
</xs:restriction>
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="memberType"> <xs:simpleType name="memberType">
...@@ -313,22 +304,21 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -313,22 +304,21 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:simpleType name="consistencyStrategy"> <xs:simpleType name="consistencyStrategy">
<xs:annotation> <xs:annotation>
<xs:documentation></xs:documentation> <xs:documentation>Used for consistencyStrategy attribute in &lt;group&gt; resource.</xs:documentation>
</xs:annotation> </xs:annotation>
<xs:restriction base="xs:integer"> <xs:restriction base="xs:integer">
<!-- ABANDON_MEMBER --> <!-- ABANDON_MEMBER -->
<xs:enumeration value="1" /> <xs:enumeration value="1" />
<!-- ABANDON_GROUP --> <!-- ABANDON_GROUP -->
<xs:enumeration value="2" /> <xs:enumeration value="2" />
<!-- TODO: this is called MODIFY_TYPE in TS-0004, but SET_MIXED in TS-0001--> <!-- SET_MIXED -->
<!-- MODIFY_TYPE -->
<xs:enumeration value="3" /> <xs:enumeration value="3" />
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="cmdType"> <xs:simpleType name="cmdType">
<xs:annotation> <xs:annotation>
<xs:documentation></xs:documentation> <xs:documentation>Used for cmdType attribute in &lt;mgmtCmd&gt; resource.</xs:documentation>
</xs:annotation> </xs:annotation>
<xs:restriction base="xs:integer"> <xs:restriction base="xs:integer">
<!-- RESET --> <!-- RESET -->
...@@ -343,6 +333,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -343,6 +333,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="5" /> <xs:enumeration value="5" />
<!-- SOFTWAREUNINSTALL --> <!-- SOFTWAREUNINSTALL -->
<xs:enumeration value="6" /> <xs:enumeration value="6" />
<!-- SOFTWAREUPDATE -->
<xs:enumeration value="7" />
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
...@@ -370,7 +362,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -370,7 +362,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:restriction base="xs:integer"> <xs:restriction base="xs:integer">
<!-- INITIATED --> <!-- INITIATED -->
<xs:enumeration value="1" /> <xs:enumeration value="1" />
<!-- STARTED --> <!-- PENDING -->
<xs:enumeration value="2" /> <xs:enumeration value="2" />
<!-- FINISHED --> <!-- FINISHED -->
<xs:enumeration value="3" /> <xs:enumeration value="3" />
...@@ -617,18 +609,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -617,18 +609,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
<!-- TODO: needs a better name (CR required) -->
<xs:simpleType name="listOfBoolean">
<xs:restriction base="xs:integer">
<!-- true -->
<xs:enumeration value="1" />
<!-- false -->
<xs:enumeration value="2" />
<!-- true and false -->
<xs:enumeration value="3" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="eventType"> <xs:simpleType name="eventType">
<xs:restriction base="xs:integer"> <xs:restriction base="xs:integer">
<!-- Data Operation --> <!-- Data Operation -->
...@@ -656,18 +636,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -656,18 +636,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="primitiveType">
<xs:annotation>
<xs:documentation></xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
<!-- Request -->
<xs:enumeration value="1" />
<!-- Response -->
<xs:enumeration value="2" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="encodingType"> <xs:simpleType name="encodingType">
<xs:restriction base="xs:integer"> <xs:restriction base="xs:integer">
<!-- Plain --> <!-- Plain -->
...@@ -679,7 +647,26 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -679,7 +647,26 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
<!-- TODO: Agree representation of SRole-ID and add to TS-0004. Possibly consider removing all values --> <xs:simpleType name="accessControlOperation">
<xs:annotation>
<xs:documentation>Shall be considered for access control policy check by the CSE</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
<!-- Create -->
<xs:enumeration value="1" />
<!-- Retrieve -->
<xs:enumeration value="2" />
<!-- Update -->
<xs:enumeration value="4" />
<!-- Delete -->
<xs:enumeration value="8" />
<!-- Notify -->
<xs:enumeration value="16" />
<!-- Discover -->
<xs:enumeration value="32" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="SRole-ID"> <xs:simpleType name="SRole-ID">
<xs:restriction base="xs:token"> <xs:restriction base="xs:token">
<!-- Software Management --> <!-- Software Management -->
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment