From 884997f7c4ba1d777e85e012d68689d31d701378 Mon Sep 17 00:00:00 2001 From: reinaortega <miguelangel.reinaortega@etsi.org> Date: Mon, 11 May 2020 14:34:18 +0200 Subject: [PATCH] XSD v2_17_0 baseline --- CDT-commonTypes.xsd | 2 ++ CDT-responsePrimitive.xsd | 6 +++++- CDT-statsCollect.xsd | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CDT-commonTypes.xsd b/CDT-commonTypes.xsd index fca3fc8..4e25f58 100644 --- a/CDT-commonTypes.xsd +++ b/CDT-commonTypes.xsd @@ -1289,6 +1289,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element name="creator" type="m2m:ID" minOccurs="0" /> <xs:element name="containerDefinition" type="xs:anyURI" /> <xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" /> + <xs:element name="contentSize" type="xs:nonNegativeInteger" /> </xs:sequence> <xs:attribute name="resourceName" type="m2m:resourceName" use="required" /> </xs:complexType> @@ -1308,6 +1309,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element name="stateTag" type="xs:nonNegativeInteger" minOccurs="0" /> <xs:element name="containerDefinition" type="xs:anyURI" /> <xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" /> + <xs:element name="contentSize" type="xs:nonNegativeInteger" /> </xs:sequence> <xs:attribute name="resourceName" type="m2m:resourceName" use="required" /> </xs:complexType> diff --git a/CDT-responsePrimitive.xsd b/CDT-responsePrimitive.xsd index 8a6b445..8a18a79 100644 --- a/CDT-responsePrimitive.xsd +++ b/CDT-responsePrimitive.xsd @@ -117,7 +117,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element name="resource" type="m2m:resourceWrapper" /> - <xs:element name="URIList" type="m2m:listOfURIs" /> + <xs:element name="URIList" > + <xs:simpleType> + <xs:list itemType="xs:anyURI" /> + </xs:simpleType> + </xs:element> <xs:element name="URI" type="xs:anyURI" /> diff --git a/CDT-statsCollect.xsd b/CDT-statsCollect.xsd index 8e0a379..36db098 100644 --- a/CDT-statsCollect.xsd +++ b/CDT-statsCollect.xsd @@ -40,7 +40,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <!-- Resource Specific Attributes --> <xs:element name="statsCollectID" type="xs:string" /> <xs:element name="collectingEntityID" type="m2m:ID" /> - <xs:element name="collectedEntityID" type="m2m:ID" /> + <xs:element name="collectedEntityID" type="m2m:listOfM2MID" /> <xs:element name="statsRuleStatus" type="m2m:statsRuleStatusType" /> <xs:element name="statModel" type="m2m:statModelType" /> <xs:element name="collectPeriod" type="m2m:scheduleEntries" minOccurs="0" /> -- GitLab