From 24f2b70c71cbfff71afb0912efed2a1c40a40ef0 Mon Sep 17 00:00:00 2001
From: Wolfgang Granzow <wgranzow@qti.qualcomm.com>
Date: Mon, 31 Jul 2017 14:53:58 +0200
Subject: [PATCH] Rel-2 changes agreed at PRO#30
See PRO-2017-0182 for a detailed description of the changes
---
v2_13_0/CDT-CSEBase-v2_13_0.xsd | 1 +
v2_13_0/CDT-enumerationTypes-v2_13_0.xsd | 9 ++++++++-
v2_13_0/CDT-remoteCSE-v2_13_0.xsd | 2 +-
v2_13_0/CDT-responsePrimitive-v2_13_0.xsd | 4 ++--
4 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/v2_13_0/CDT-CSEBase-v2_13_0.xsd b/v2_13_0/CDT-CSEBase-v2_13_0.xsd
index 967e5cf..57b7078 100644
--- a/v2_13_0/CDT-CSEBase-v2_13_0.xsd
+++ b/v2_13_0/CDT-CSEBase-v2_13_0.xsd
@@ -64,6 +64,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:element>
<xs:element name="pointOfAccess" type="m2m:poaList" />
<xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" />
+ <xs:element name="dynamicAuthorizationConsultationIDs" type="m2m:listOfURIs" minOccurs="0" />
<xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
<!-- Child Resources -->
diff --git a/v2_13_0/CDT-enumerationTypes-v2_13_0.xsd b/v2_13_0/CDT-enumerationTypes-v2_13_0.xsd
index 4cc6123..2f0bffc 100644
--- a/v2_13_0/CDT-enumerationTypes-v2_13_0.xsd
+++ b/v2_13_0/CDT-enumerationTypes-v2_13_0.xsd
@@ -261,6 +261,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:restriction base="xs:integer">
<!-- ACCEPTED -->
<xs:enumeration value="1000" />
+ <!-- ACCEPTED for nonBlockingRequestSynch -->
+ <xs:enumeration value="1001" />
+ <!-- ACCEPTED for nonBlockingRequestAsynch -->
+ <xs:enumeration value="1002" />
<!-- OK -->
<xs:enumeration value="2000" />
<!-- CREATED -->
@@ -309,7 +313,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="4115" />
<!-- ESPRIM_IMPERSONATION_ERROR -->
<xs:enumeration value="4116" />
- <!-- INTERNAL_SERVER_ERROR -->
+ <!-- ORIGINATOR_HAS_ALREADY_REGISTERED -->
+ <xs:enumeration value="4117" />
+ <!-- INTERNAL_SERVER_ERROR -->
<xs:enumeration value="5000" />
<!-- NOT_IMPLEMENTED -->
<xs:enumeration value="5001" />
@@ -365,6 +371,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="6029" />
</xs:restriction>
</xs:simpleType>
+
<xs:simpleType name="requestStatus">
<xs:annotation>
diff --git a/v2_13_0/CDT-remoteCSE-v2_13_0.xsd b/v2_13_0/CDT-remoteCSE-v2_13_0.xsd
index bf13f07..8683598 100644
--- a/v2_13_0/CDT-remoteCSE-v2_13_0.xsd
+++ b/v2_13_0/CDT-remoteCSE-v2_13_0.xsd
@@ -53,8 +53,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="Trigger-Recipient-ID" type="m2m:triggerRecipientID" minOccurs="0" />
<xs:element name="requestReachability" type="xs:boolean" />
<xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" />
- <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
<xs:element name="triggerReferenceNumber" type="xs:unsignedInt" minOccurs="0" />
+ <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
diff --git a/v2_13_0/CDT-responsePrimitive-v2_13_0.xsd b/v2_13_0/CDT-responsePrimitive-v2_13_0.xsd
index 02acbf9..6ae7506 100644
--- a/v2_13_0/CDT-responsePrimitive-v2_13_0.xsd
+++ b/v2_13_0/CDT-responsePrimitive-v2_13_0.xsd
@@ -151,8 +151,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
<xs:complexType name="listOfChildResourceRef">
- <xs:sequence>
- <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="0" maxOccurs="unbounded" />
+ <xs:sequence>
+ <xs:element name="resourceRef" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
</xs:sequence>
</xs:complexType>
--
GitLab