SDS-2020-0343R03 - TS-0004_AnnouncementUpdate_R4

Signed-off-by: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>

CDT-CSEBase.xsd

@@ -92,6 +92,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
                         <xs:choice minOccurs="0" maxOccurs="1">
                             <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
                             <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="m2m:CSEBaseAnnc" />
                                 <xs:element ref="m2m:remoteCSE" />
                                 <xs:element ref="m2m:remoteCSEAnnc" />
                                 <xs:element ref="m2m:node" />
@@ -136,4 +137,41 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			</xs:complexContent>
 		</xs:complexType>
 	</xs:element>
+	
+	<xs:element name="CSEBaseAnnc" substitutionGroup="m2m:sg_announcedResource">
+		<xs:complexType>
+			<xs:complexContent>
+				<!-- Inherit just the universal resource attributes -->
+				<xs:extension base="m2m:announcedResource">
+					<xs:sequence>
+						<!-- Resource Specific Attributes -->
+						<xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
+					    <xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" minOccurs="1"/>
+					    
+                        <!-- Child Resources -->
+                        <xs:choice minOccurs="0" maxOccurs="1">
+                            <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                            <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="m2m:remoteCSEAnnc" />
+                                <xs:element ref="m2m:nodeAnnc" />
+                                <xs:element ref="m2m:containerAnnc" />
+                                <xs:element ref="m2m:groupAnnc" />
+                                <xs:element ref="m2m:accessControlPolicyAnnc" />
+                                <xs:element ref="m2m:timeSeriesAnnc" />
+                            	<xs:element ref="m2m:locationPolicyAnnc" />
+                            	<xs:element ref="m2m:AEAnnc" />
+                            	<xs:element ref="m2m:sg_announcedFlexContainerResource" />
+                            	<xs:element ref="m2m:ontologyRepositoryAnnc" />
+                            	<xs:element ref="m2m:semanticMashupJobProfileAnnc" />
+                            	<xs:element ref="m2m:semanticMashupInstanceAnnc" />
+                            	<xs:element ref="m2m:timeSyncBeaconAnnc" />
+                            	<xs:element ref="m2m:primitiveProfileAnnc" />
+                            </xs:choice>
+                        </xs:choice>
+					</xs:sequence>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+
 </xs:schema>

CDT-enumerationTypes.xsd

@@ -167,6 +167,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<xs:enumeration value="10003" />
 			<!-- contentInstanceAnnc -->
 			<xs:enumeration value="10004" />
+			<!-- CSEBaseAnnc -->
+			<xs:enumeration value="10005" />
 			<!-- groupAnnc -->
 			<xs:enumeration value="10009" />
 			<!-- locationPolicyAnnc -->