From d63ba4e2a28c2ade4bc109e15e41a9757b33b50a Mon Sep 17 00:00:00 2001 From: Wolfgang Granzow <wgranzow@qti.qualcomm.com> Date: Wed, 11 Apr 2018 15:13:00 +0200 Subject: [PATCH] Changes agreed at PRO#34/TP#34 for Rel-2 See PRO-2018-0119 for a detailed list of changes --- v2_17_0/CDT-commonTypes-v2_17_0.xsd | 2 ++ v2_17_0/CDT-responsePrimitive-v2_17_0.xsd | 6 +++++- v2_17_0/CDT-statsCollect-v2_17_0.xsd | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/v2_17_0/CDT-commonTypes-v2_17_0.xsd b/v2_17_0/CDT-commonTypes-v2_17_0.xsd index 8b55725..7691caa 100644 --- a/v2_17_0/CDT-commonTypes-v2_17_0.xsd +++ b/v2_17_0/CDT-commonTypes-v2_17_0.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/v2_17_0/CDT-responsePrimitive-v2_17_0.xsd b/v2_17_0/CDT-responsePrimitive-v2_17_0.xsd index 2efdb6b..0d746e9 100644 --- a/v2_17_0/CDT-responsePrimitive-v2_17_0.xsd +++ b/v2_17_0/CDT-responsePrimitive-v2_17_0.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/v2_17_0/CDT-statsCollect-v2_17_0.xsd b/v2_17_0/CDT-statsCollect-v2_17_0.xsd index 9963245..e139785 100644 --- a/v2_17_0/CDT-statsCollect-v2_17_0.xsd +++ b/v2_17_0/CDT-statsCollect-v2_17_0.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