Commit 6368a537 authored by Wolfgang Granzow's avatar Wolfgang Granzow

(cmdh) alignment with #663R04

parent 5dcd0be5
......@@ -35,9 +35,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:complexContent>
<!-- Inherit Common Attributes from regularResourceType -->
<xs:extension base="m2m:mgmtResource">
<xs:sequence>
<!-- Resource Specific Attributes -->
<xs:element name="activeCmdhPolicyLink" type="m2m:ID" minOccurs="1" maxOccurs="1"/>
<xs:sequence>
<!-- Resource Specific Attributes -->
<xs:element name="activeCmdhPolicyLink" type="m2m:ID" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
......
......@@ -29,7 +29,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
elementFormDefault="unqualified" attributeFormDefault="unqualified" >
<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
<xs:element name="cmdhBuffer">
<xs:complexType>
......@@ -37,24 +36,17 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Inherit Common Attributes from data type "mgmtResource" -->
<xs:extension base="m2m:mgmtResource">
<xs:sequence>
<!-- mgmtObj specialization-specific Attributes -->
<xs:element name="applicableEventCategory" type="m2m:listOfEventCat" minOccurs="1" maxOccurs="1" />
<xs:element name="maxBufferSize" type="xs:nonNegativeInteger" minOccurs="1" maxOccurs="1"/> <!-- unit in bytes -->
<xs:element name="storagePriority" minOccurs="1" maxOccurs="1">
<!-- mgmtObj specialization-specific Attributes -->
<!-- TODO: typo in CR #663R04 in "list of m2m:leventCatWithDef", to be corrected by the Rapporteur -->
<xs:element name="applicableEventCategory" type="m2m:listOfEventCatWithDef" />
<xs:element name="maxBufferSize" type="xs:nonNegativeInteger" /> <!-- unit in bytes -->
<xs:element name="storagePriority">
<xs:simpleType>
<xs:restriction base="xs:positiveInteger">
<xs:maxExclusive value="11"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
<!-- 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>
</xs:choice>
</xs:choice>
</xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
......
......@@ -29,7 +29,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
elementFormDefault="unqualified" attributeFormDefault="unqualified" >
<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
<xs:element name="cmdhDefEcValue">
<xs:complexType>
......@@ -38,20 +37,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:extension base="m2m:mgmtResource">
<xs:sequence>
<!-- mgmtObj specialization-specific Attributes -->
<xs:element name="order" type="xs:positiveInteger" minOccurs="1" maxOccurs="1" />
<xs:element name="defEcValue" type="m2m:eventCatType" minOccurs="1" maxOccurs="1" />
<xs:element name="requestOrigin" type="m2m:listOfM2MID" minOccurs="1" maxOccurs="1" />
<xs:element name="requestContext" type="xs:string" minOccurs="0" maxOccurs="1" />
<xs:element name="requestContextNotification" type="xs:boolean" minOccurs="0" maxOccurs="1" />
<xs:element name="requestCharacteristics" type="xs:string" minOccurs="0" maxOccurs="1" />
<!-- 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>
</xs:choice>
</xs:choice>
<xs:element name="order" type="xs:positiveInteger" />
<xs:element name="defEcValue" type="m2m:eventCat" />
<xs:element name="requestOrigin" type="m2m:listOfM2MID" />
<xs:element name="requestContext" type="xs:anyType" minOccurs="0" />
<xs:element name="requestContextNotification" type="xs:boolean" minOccurs="0" />
<xs:element name="requestCharacteristics" type="xs:anyType" minOccurs="0" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
......
......@@ -29,7 +29,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
elementFormDefault="unqualified" attributeFormDefault="unqualified" >
<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
<xs:element name="cmdhDefaults">
<xs:complexType>
......@@ -41,16 +40,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Instantiations of this [cmdhDefaults] resource type shall include mgmntLink's to
the following children:
1 or more mgmtLink to instance(s) of resource type [cmdhDefEcValue]
1 mgmtLink to instance(s) of resource type [cmdhEcDefParamValues] -->
1 or more mgmtLink to instance(s) of resource type [cmdhEcDefParamValues] -->
<!-- TODO: text in Table D.12.2-2 column "Default Value and Constraints" needs to be updated
ref to [cmdhEcDefParamValues] is missing -->
<xs:element name="mgmtLink" type="m2m:mgmtLinkRef" minOccurs="2" maxOccurs="unbounded"/>
<!-- 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>
</xs:choice>
</xs:choice>
</xs:sequence>
</xs:extension>
</xs:complexContent>
......
......@@ -29,8 +29,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
elementFormDefault="unqualified" attributeFormDefault="unqualified" >
<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
<xs:element name="cmdhEcDefParamValues">
<xs:complexType>
......@@ -39,19 +37,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:extension base="m2m:mgmtResource">
<xs:sequence>
<!-- mgmtObj specialization-specific Attributes -->
<xs:element name="applicableEventCategory" type="m2m:listOfEventCat" minOccurs="1" maxOccurs="1" />
<xs:element name="defaultRequestExpTime" type="m2m:longMin-1" minOccurs="1" maxOccurs="1" /> <!-- units in milliseconds -->
<xs:element name="defaultResultExpTime" type="m2m:longMin-1" minOccurs="1" maxOccurs="1" /> <!-- units in milliseconds -->
<xs:element name="defaultOpExecTime" type="m2m:longMin-1" minOccurs="1" maxOccurs="1" /> <!-- units in milliseconds -->
<xs:element name="defaultRespPersistence" type="m2m:longMin-1" minOccurs="1" maxOccurs="1" /> <!-- units in milliseconds -->
<xs:element name="defaultDelAggregation" type="xs:boolean" minOccurs="1" maxOccurs="1" />
<!-- 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>
</xs:choice>
</xs:choice>
<xs:element name="applicableEventCategory" type="m2m:listOfEventCatWithDef" />
<!-- TODO: confirm whether we should use xs:long (as in TS-0004) or m2m:longMin-1 for following 4 attributes -->
<xs:element name="defaultRequestExpTime" type="xs:long" /> <!-- units in milliseconds -->
<xs:element name="defaultResultExpTime" type="xs:long" /> <!-- units in milliseconds -->
<xs:element name="defaultOpExecTime" type="xs:long" /> <!-- units in milliseconds -->
<xs:element name="defaultRespPersistence" type="xs:long" /> <!-- units in milliseconds -->
<xs:element name="defaultDelAggregation" type="xs:boolean" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
......
......@@ -39,25 +39,35 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:extension base="m2m:mgmtResource">
<xs:sequence>
<!-- mgmtObj specialization-specific Attributes -->
<xs:element name="order" type="xs:positiveInteger" minOccurs="1" maxOccurs="1" />
<xs:element name="requestOrigin" type="m2m:listOfM2MID" minOccurs="1" maxOccurs="1" />
<xs:element name="requestContext" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
<xs:element name="requestContextNotification" type="xs:boolean" minOccurs="0" maxOccurs="1" />
<xs:element name="requestCharacteristics" type="xs:string" minOccurs="0" maxOccurs="1" />
<xs:element name="limitsEventCategory" type="m2m:listOfEventCat" minOccurs="1" maxOccurs="1" />
<xs:element name="limitsRequestExpTime" type="m2m:listOfMinMax" minOccurs="1" maxOccurs="1" />
<xs:element name="limitsResultExpTime" type="m2m:listOfMinMax" minOccurs="1" maxOccurs="1" />
<xs:element name="limitsOpExecTime" type="m2m:listOfMinMax" minOccurs="1" maxOccurs="1" />
<xs:element name="limitsRespPersistence" type="m2m:listOfMinMax" minOccurs="1" maxOccurs="1" />
<xs:element name="limitsDelAggregation" type="m2m:listOfBoolean" minOccurs="1" maxOccurs="1" />
<!-- 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>
</xs:choice>
</xs:choice>
<xs:element name="order" type="xs:positiveInteger" />
<xs:element name="requestOrigin" type="m2m:listOfM2MID" />
<!-- TODO change to xs:anyType missing in CR #663R04 -->
<xs:element name="requestContext" type="xs:anyType" />
<xs:element name="requestContextNotification" type="xs:boolean" minOccurs="0" />
<!-- TODO change to xs:anyType missing in CR #663R04 -->
<xs:element name="requestCharacteristics" type="xs:anyType" />
<xs:element name="limitsEventCategory" type="m2m:listOfEventCat" />
<xs:element name="limitsRequestExpTime" type="m2m:listOfMinMax" />
<xs:element name="limitsResultExpTime" type="m2m:listOfMinMax" />
<xs:element name="limitsOpExecTime" type="m2m:listOfMinMax" />
<xs:element name="limitsRespPersistence" type="m2m:listOfMinMax" />
<!-- TODO: check was happened with implementation of "m2m:permittedBooleanValues" in #661R04 -->
<xs:element name="limitsDelAggregation" >
<xs:simpleType>
<xs:restriction base="xs:token">
<xs:annotation>
<xs:documentation>defines data type denoted "m2m:permittedBooleanValues" in #663R04.
</xs:documentation>
</xs:annotation>
<!-- False -->
<xs:enumeration value="0" />
<!-- True -->
<xs:enumeration value="1" />
<!-- True and False -->
<xs:enumeration value="0 1" />
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
......
......@@ -29,7 +29,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
elementFormDefault="unqualified" attributeFormDefault="unqualified" >
<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
<xs:element name="cmdhNetworkAccessRules">
<xs:complexType>
......@@ -39,19 +38,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:extension base="m2m:mgmtResource">
<xs:sequence>
<!-- mgmtObj specialization-specific Attributes -->
<xs:element name="applicableEventCategories" type="m2m:listOfEventCat" minOccurs="1" maxOccurs="1" />
<!-- TODO: typo in CR #663R04 in "list of m2m:leventCatWithDef", to be corrected by the Rapporteur -->
<xs:element name="applicableEventCategories" type="m2m:listOfEventCatWithDef" />
<!-- Instantiations of this [cmdhPolicy] resource type shall include mgmntLink's to
the following children:
zero or more mgmtLink to instance(s) of resource type [cmdhNwAccessRule] -->
<xs:element name="mgmtLink" type="m2m:mgmtLinkRef" minOccurs="0" maxOccurs="unbounded"/>
<!-- 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>
</xs:choice>
</xs:choice>
</xs:sequence>
</xs:extension>
</xs:complexContent>
......
......@@ -29,7 +29,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
elementFormDefault="unqualified" attributeFormDefault="unqualified" >
<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
<xs:element name="cmdhNwAccessRule">
<xs:complexType>
......@@ -41,22 +40,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="targetNetwork" type="m2m:listOfM2MID" minOccurs="1" maxOccurs="1" />
<xs:element name="minReqVolume" type="xs:nonNegativeInteger" minOccurs="1" maxOccurs="1" />
<xs:element name="backOffParameters" type="m2m:backOffParameters" minOccurs="1" maxOccurs="1" />
<xs:element name="otherConditions" type="xs:string" minOccurs="1" maxOccurs="1" />
<xs:element name="otherConditions" type="xs:anyType" minOccurs="1" maxOccurs="1" />
<!-- Instantiations of this [cmdhPolicy] resource type shall include mgmntLink's to
the following children:
1 mgmtLink to an instance of resource type [schedule] with fixed name allowedSchedule,
1 or more mgmtLink to instance(s) of resource type [cmdhLimits],
1 or more mgmtLink to instance(s) of resource type [cmdhNetworkAccessRules]
1 or more mgmtLink to instance(s) of resource type [cmdhBuffer] -->
<xs:element name="mgmtLink" type="m2m:mgmtLinkRef" minOccurs="0" maxOccurs="unbounded"/>
<!-- 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>
</xs:choice>
</xs:choice>
zero or more mgmtLink to instance(s) of resource type schedule -->
<!-- TODO: clarify if multiple schedule elements shall be included rather than a link to non-mgmtObj specialization -->
<xs:element name="mgmtLink" type="m2m:mgmtLinkRef" minOccurs="1" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
......
......@@ -29,7 +29,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
elementFormDefault="unqualified" attributeFormDefault="unqualified" >
<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
<xs:element name="cmdhPolicy" >
<xs:complexType>
......@@ -45,15 +44,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
1 or more mgmtLink to instance(s) of resource type [cmdhLimits],
1 or more mgmtLink to instance(s) of resource type [cmdhNetworkAccessRules]
1 or more mgmtLink to instance(s) of resource type [cmdhBuffer] -->
<xs:element name="mgmtLink" type="m2m:mgmtLinkRef" minOccurs="0" maxOccurs="unbounded"/>
<!-- 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>
</xs:choice>
</xs:choice>
<xs:element name="mgmtLink" type="m2m:mgmtLinkRef" minOccurs="4" maxOccurs="unbounded"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
......
......@@ -107,7 +107,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<list itemType="m2m:eventCat" />
</xs:simpleType>
<xs:simpleType name="listOfEventCatwithDef">
<xs:simpleType name="listOfEventCatWithDef">
<list itemType="m2m:eventCatWithDef" />
</xs:simpleType>
......
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