From 416a886c3782f33c26262d65982ea3d9e4666370 Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Mon, 11 May 2020 10:21:47 +0200
Subject: [PATCH] XSD v2_4_0 baseline
---
CDT-enumerationTypes.xsd | 24 ++++++++++++++++++++++++
CDT-node.xsd | 2 +-
CDT-subscription.xsd | 2 +-
3 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/CDT-enumerationTypes.xsd b/CDT-enumerationTypes.xsd
index 78dc687..15e4c14 100644
--- a/CDT-enumerationTypes.xsd
+++ b/CDT-enumerationTypes.xsd
@@ -175,6 +175,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="2" />
<!-- blockingRequest -->
<xs:enumeration value="3" />
+ <!-- flexBlocking -->
+ <xs:enumeration value="4" />
</xs:restriction>
</xs:simpleType>
@@ -363,6 +365,26 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="22" />
<!-- subscription -->
<xs:enumeration value="23" />
+ <!-- accessControlPolicyAnnc -->
+ <xs:enumeration value="10001" />
+ <!-- AEAnnc -->
+ <xs:enumeration value="10002" />
+ <!-- containerAnnc -->
+ <xs:enumeration value="10003" />
+ <!-- contentInstanceAnnc -->
+ <xs:enumeration value="10004" />
+ <!-- groupAnnc -->
+ <xs:enumeration value="10009" />
+ <!-- locationPolicyAnnc -->
+ <xs:enumeration value="10010" />
+ <!-- mgmtObjAnnc -->
+ <xs:enumeration value="10013" />
+ <!-- nodeAnnc -->
+ <xs:enumeration value="10014" />
+ <!-- remoteCSEAnnc -->
+ <xs:enumeration value="10016" />
+ <!-- scheduleAnnc -->
+ <xs:enumeration value="10018" />
<!-- Mixed -->
<xs:enumeration value="24" />
@@ -547,6 +569,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="3" />
<!-- Delete of Direct Child Resource -->
<xs:enumeration value="4" />
+ <!-- Retrieve of Container Resource With No Child Resource -->
+ <xs:enumeration value="5" />
</xs:restriction>
</xs:simpleType>
diff --git a/CDT-node.xsd b/CDT-node.xsd
index 88301f7..6078487 100644
--- a/CDT-node.xsd
+++ b/CDT-node.xsd
@@ -81,7 +81,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes for announceable Resources -->
- <xs:extension base="m2m:announceableResource">
+ <xs:extension base="m2m:announcedResource">
<!-- Resource Specific Attributes -->
<xs:sequence>
<xs:element name="nodeID" type="m2m:nodeID" />
diff --git a/CDT-subscription.xsd b/CDT-subscription.xsd
index 44bb0e5..00e8b2c 100644
--- a/CDT-subscription.xsd
+++ b/CDT-subscription.xsd
@@ -78,7 +78,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="sizeBelow" type="xs:positiveInteger" minOccurs="0" />
<xs:element name="operationMonitor" type="m2m:operation" minOccurs="0" maxOccurs="5" />
<xs:element name="attribute" type="m2m:attribute" minOccurs="0" maxOccurs="unbounded" />
- <xs:element name="notificationEventType" type="m2m:notificationEventType" minOccurs="0" maxOccurs="4" />
+ <xs:element name="notificationEventType" type="m2m:notificationEventType" minOccurs="0" maxOccurs="5" />
</xs:sequence>
</xs:complexType>
--
GitLab