From 44ef82cb43e6689c297fbca1673898b88dd63cbb Mon Sep 17 00:00:00 2001
From: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
Date: Tue, 17 May 2022 08:11:40 +0200
Subject: [PATCH] SDS-2020-0013R02-TS0004 - flexContainerInstance

Signed-off-by: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
---
 CDT-commonTypes.xsd      | 28 +++++++++++++++++++++++++++-
 CDT-enumerationTypes.xsd |  4 ++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/CDT-commonTypes.xsd b/CDT-commonTypes.xsd
index 3ed33ef..a1ae976 100644
--- a/CDT-commonTypes.xsd
+++ b/CDT-commonTypes.xsd
@@ -1549,6 +1549,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
 					<xs:element name="contentSize" type="xs:nonNegativeInteger" />
 					<xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" />
+					<xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" />
+					<xs:element name="maxInstanceAge" type="xs:nonNegativeInteger" minOccurs="0" />
+					<xs:element name="maxByteSize" type="xs:nonNegativeInteger" minOccurs="0" />
+					<xs:element name="currentNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" />
+					<xs:element name="currentByteSize" type="xs:nonNegativeInteger" minOccurs="0" />
+										
 				</xs:sequence>	
 				<xs:attribute name="resourceName" type="m2m:resourceName" use="required" />				
 	</xs:complexType>
@@ -1571,10 +1577,29 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
 					<xs:element name="contentSize" type="xs:nonNegativeInteger" minOccurs="0"/>
 					<xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" />
+					<xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" />
+					<xs:element name="maxInstanceAge" type="xs:nonNegativeInteger" minOccurs="0" />
+					<xs:element name="maxByteSize" type="xs:nonNegativeInteger" minOccurs="0" />
+					<xs:element name="currentNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" />
+					<xs:element name="currentByteSize" type="xs:nonNegativeInteger" minOccurs="0" />
 				</xs:sequence>	
 		<xs:attribute name="resourceName" type="m2m:resourceName" use="required" />									
 	</xs:complexType>
 	
+	<xs:complexType name="flexContainerInstanceResource">
+				<xs:sequence>
+					<xs:element name="resourceType" type="m2m:resourceType" />
+					<xs:element name="resourceID" type="m2m:ID" />
+					<xs:element name="parentID" type="m2m:nhURI" />
+					<xs:element name="creationTime" type="m2m:timestamp" />
+					<xs:element name="expirationTime" type="m2m:timestamp" />
+					<xs:element name="labels" type="m2m:labels" minOccurs="0" />					
+					<xs:element name="contentSize" type="xs:nonNegativeInteger" />
+						
+				</xs:sequence>	
+				<xs:attribute name="resourceName" type="m2m:resourceName" use="required" />				
+	</xs:complexType>
+
 	<!-- The following Global Elements define substitution groups -->
 	<xs:element name="sg_resource" type="m2m:resource"  abstract="true" />
 	<xs:element name="sg_regularResource" type="m2m:regularResource"  abstract="true" />
@@ -1587,5 +1612,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	<xs:element name="sg_announcedMgmtResource" type="m2m:announcedMgmtResource" abstract="true" />
 	<xs:element name="sg_flexContainerResource" type="m2m:flexContainerResource"  abstract="true" />
 	<xs:element name="sg_announcedFlexContainerResource" type="m2m:announcedFlexContainerResource"  abstract="true" />
-
+	<xs:element name="sg_flexContainerInstanceResource" type="m2m:flexContainerInstanceResource"  abstract="true" />
+	
 </xs:schema>
diff --git a/CDT-enumerationTypes.xsd b/CDT-enumerationTypes.xsd
index d50cb26..774d648 100644
--- a/CDT-enumerationTypes.xsd
+++ b/CDT-enumerationTypes.xsd
@@ -145,6 +145,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<xs:enumeration value="56" />
 			<!-- semanticRuleRepository -->
 			<xs:enumeration value="57" />			
+			<!-- flexContainerInstance -->
+			<xs:enumeration value="58" />			
 			<!-- accessControlPolicyAnnc -->
 			<xs:enumeration value="10001" />
 			<!-- AEAnnc -->
@@ -652,6 +654,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<xs:enumeration value="56" />
 			<!-- semanticRuleRepository -->
 			<xs:enumeration value="57" />			
+			<!-- flexContainerInstance -->
+			<xs:enumeration value="58" />			
 			<!-- accessControlPolicyAnnc -->
 			<xs:enumeration value="10001" />
 			<!-- AEAnnc -->
-- 
GitLab