From e0070d85092f2210d6a5dd6493438c911403c700 Mon Sep 17 00:00:00 2001
From: Wolfgang Granzow <wgranzow@qti.qualcomm.com>
Date: Fri, 5 Aug 2016 11:03:35 +0200
Subject: [PATCH] Update of m2m:flexContainerResource and
 m2m:announcedFlexContainerResource

---
 v2_7_0/CDT-commonTypes-v2_7_0.xsd | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/v2_7_0/CDT-commonTypes-v2_7_0.xsd b/v2_7_0/CDT-commonTypes-v2_7_0.xsd
index 438c39f..60a6f65 100644
--- a/v2_7_0/CDT-commonTypes-v2_7_0.xsd
+++ b/v2_7_0/CDT-commonTypes-v2_7_0.xsd
@@ -982,25 +982,43 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	
 	<xs:complexType name="flexContainerResource">
 		<xs:complexContent>
-			<xs:extension base="m2m:announceableResource">
+			<xs:extension base="m2m:namedResource">		
 				<xs:sequence>
+					<xs:element name="creationTime" type="m2m:timestamp" minOccurs="0" />
+					<xs:element name="lastModifiedTime" type="m2m:timestamp" minOccurs="0" />
+					<xs:element name="labels" type="m2m:labels" minOccurs="0" />					
+					<xs:element name="accessControlPolicyIDs" type="m2m:acpType" minOccurs="0" />
+					<xs:element name="expirationTime" type="m2m:timestamp" minOccurs="0" />
+					<xs:element name="dynamicAuthorizationConsultationIDs" type="m2m:listOfURIs" minOccurs="0" />					
+					<xs:element name="announceTo" type="m2m:listOfURIs" minOccurs="0" />
+					<xs:element name="announcedAttribute" type="m2m:listOfNCNames" minOccurs="0" />
+					<xs:element name="stateTag" type="xs:nonNegativeInteger" />
 					<xs:element name="containerDefinition" type="xs:anyURI" />
 					<xs:element name="creator" type="m2m:ID" minOccurs="0" />
 					<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
-				</xs:sequence>
+				</xs:sequence>				
 			</xs:extension>
-		</xs:complexContent>
+		</xs:complexContent>					
 	</xs:complexType>
 	
 	<xs:complexType name="announcedFlexContainerResource">
 		<xs:complexContent>
-			<xs:extension base="m2m:announcedResource">
+			<xs:extension base="m2m:namedResource">		
 				<xs:sequence>
+					<xs:element name="creationTime" type="m2m:timestamp" minOccurs="0" />
+					<xs:element name="lastModifiedTime" type="m2m:timestamp" minOccurs="0" />
+					<xs:element name="labels" type="m2m:labels" minOccurs="0" />					
+					<xs:element name="accessControlPolicyIDs" type="m2m:acpType" minOccurs="0" />
+					<xs:element name="expirationTime" type="m2m:timestamp" minOccurs="0" />
+					<xs:element name="link" type="xs:anyURI" minOccurs="0" />
+					<xs:element name="dynamicAuthorizationConsultationIDs" type="m2m:listOfURIs" minOccurs="0" />					
+					<xs:element name="stateTag" type="xs:nonNegativeInteger" />
 					<xs:element name="containerDefinition" type="xs:anyURI" />
 					<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
-				</xs:sequence>
+				</xs:sequence>				
 			</xs:extension>
-		</xs:complexContent>
+		</xs:complexContent>					
 	</xs:complexType>
+	
 
 </xs:schema>
-- 
GitLab