From 3e7f0e93b00e01ab5e41cf3b8830b7783192a3dd Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Mon, 11 May 2020 09:00:41 +0200
Subject: [PATCH] XSD v1_6_0 baseline

---
 CDT-enumerationTypes.xsd | 22 +++++++++++++++++++++-
 CDT-node.xsd             |  2 +-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/CDT-enumerationTypes.xsd b/CDT-enumerationTypes.xsd
index 514ccd1..16bfcc0 100644
--- a/CDT-enumerationTypes.xsd
+++ b/CDT-enumerationTypes.xsd
@@ -362,7 +362,27 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
             <!-- statsConfig -->
             <xs:enumeration value="22" />
             <!-- subscription -->
-            <xs:enumeration value="23" />
+            <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" />
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" />
-- 
GitLab