Merge branch 'Release2-onwards' into Release3-onwards

Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>

LibOneM2M/OneM2M_Pixits.ttcn

@@ -133,6 +133,15 @@ module OneM2M_Pixits {
 			 */			
 			modulepar float PX_TCONFIG_IUT					:= 10.0;
 						
+			group flexContainerContainerDefinitions {
+				/**
+				 * @desc These contain the identifier reference (URI) to the <flexContainer> schema definition which is used by the CSE to validate the syntax of the <flexContainer> resource 
+				 */			
+				modulepar XSD.AnyURI PX_CND_GENERIC_INTERWORKING_SERVICE := "urn:m2m:CDT-gis-v2_21_0.xsd";
+			
+				modulepar XSD.AnyURI PX_CND_GENERIC_INTERWORKING_OPERATION_INSTANCE := "urn:m2m:CDT-gio-v2_21_0.xsd";
+			
+		}
 		}
 		
 		group TesterParameters {

LibOneM2M/OneM2M_Templates.ttcn

@@ -2760,7 +2760,7 @@ module OneM2M_Templates {
 			announcedAttribute := omit,//O
 			stateTag := omit,//NP
 			creator := omit,//O
-			containerDefinition := "urn:m2m:CDT-gis-v2_17_0.xsd",//M
+			containerDefinition := PX_CND_GENERIC_INTERWORKING_SERVICE,//M
 			ontologyRef := omit,//O
 			contentSize := omit,//NP
 			serviceName := "MyService",//M??
@@ -7788,7 +7788,7 @@ module OneM2M_Templates {
 			announcedAttribute := omit,//O
 			stateTag := omit,//NP
 			creator := omit,//O
-			containerDefinition := "urn:m2m:CDT-gis-v2_17_0.xsd",//M
+			containerDefinition := PX_CND_GENERIC_INTERWORKING_SERVICE,//M
 			ontologyRef := omit,//O
 			contentSize := omit, //NP
 			serviceName := "MyService",//M??