From 32bc661ccb97f2633ce0bb1d406ad8de3a99103e Mon Sep 17 00:00:00 2001
From: acverdugo <acverdugo@at4wireless.com>
Date: Thu, 23 Nov 2017 17:04:21 +0100
Subject: [PATCH] Typo issues Fixed issues in remoteCSE templates New TCs
 created: TC_CSE_REG_CRE_024, TC_CSE_REG_CRE_025, TC_CSE_REG_CRE_026_RN,
 TC_CSE_REG_CRE_026_ET, TC_CSE_REG_CRE_026_LBL, TC_CSE_REG_CRE_026_POA,
 TC_CSE_REG_CRE_026_NL

Signed-off-by: acverdugo <acverdugo@at4wireless.com>
---
 LibOneM2M/OneM2M_Functions.ttcn    |  12 +-
 LibOneM2M/OneM2M_Templates.ttcn    |  40 +++++-
 OneM2M_TestControl_IN_profile.ttcn |   7 +
 OneM2M_Testcases_AE.ttcn           | 140 +++++++++---------
 OneM2M_Testcases_CSE.ttcn          | 221 +++++++++++++++++++++++++++--
 5 files changed, 330 insertions(+), 90 deletions(-)

diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index c78ac54..c93b8cc 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -1572,7 +1572,7 @@ module OneM2M_Functions {
 				alt {
 					[] mccPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
 						tc_ac.stop;
-						setverdict(pass, __SCOPE__&":INFO: Resource type RemoteCSE created successfuly");
+						setverdict(pass, __SCOPE__&":INFO: Resource type remoteCSE created successfuly");
 						f_checkAttributesToBeSaved(int16, v_request, v_response.primitive.responsePrimitive);
 						v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int16, -1);
 						v_remoteCSEResource := f_cse_generateLocalResource(v_response.primitive.responsePrimitive.primitiveContent, vc_cSEBaseIndex, int16);
@@ -1580,14 +1580,14 @@ module OneM2M_Functions {
 					}
 					[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) {
 						tc_ac.stop;
-						setverdict(inconc, __SCOPE__&":INFO: Error while creating resource type RemoteCSE");
+						setverdict(inconc, __SCOPE__&":INFO: Error while creating resource type remoteCSE");
 					}
 					[] mccPort.receive {
 						tc_ac.stop;
 						setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
 					}
 					[] tc_ac.timeout {
-						setverdict(inconc, __SCOPE__&":INFO: No answer while creating resource type RemoteCSE");
+						setverdict(inconc, __SCOPE__&":INFO: No answer while creating resource type remoteCSE");
 					}
 				}	
 
@@ -1610,7 +1610,7 @@ module OneM2M_Functions {
 				var integer v_localResourceIndex := -1;
 				var integer v_resourceIndex := -1;
 				var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
-				var charstring v_action := "Please, register CSE on the Tester";
+				var charstring v_action := "Please, send a CSE registration request";
 				
 				//send triggering primitive to SUT
 			  	f_sendUtPrimitive(v_utRequest,v_action);
@@ -1619,7 +1619,7 @@ module OneM2M_Functions {
 				alt {
 					[] mccPortIn.receive(mw_request(p_requestPrimitive)) -> value v_request {
 						tc_ac.stop;
-						setverdict(pass, __SCOPE__&":INFO: Resource type RemoteCSE created successfuly");
+						setverdict(pass, __SCOPE__&":INFO: Resource type remoteCSE created successfuly");
 						v_remoteCSEResource := f_cse_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, vc_cSEBaseIndex, int16);//TODO Get index from v_request.primitive.requestPrimitive.to_
 						v_localResourceIndex := f_setLocalResource(v_remoteCSEResource, int16, vc_cSEBaseIndex);
 						
@@ -1636,7 +1636,7 @@ module OneM2M_Functions {
 						setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
 					}
 					[] tc_ac.timeout {
-						setverdict(inconc, __SCOPE__&":INFO: No request received for creating resource type RemoteCSE");
+						setverdict(inconc, __SCOPE__&":INFO: No request received for creating resource type remoteCSE");
 					}
 				}	
 
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index c331bfb..eedc520 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -656,11 +656,19 @@ module OneM2M_Templates {
 			};
 			
 			/**
-			 * @desc CREATE request primitive for remoteCSE resource
+			 * @desc Reception template for CREATE RemoteCSE
+			 */
+			template RequestPrimitive mw_createRemoteCSE(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int16,
+				primitiveContent := {remoteCSE := ?}	//{remoteCSE := m_contentCreateRemoteCSE(p_resourceName, p_accessControlPolicyIds,p_cSEBase, p_cSE_ID)}
+			};
+			
+			/**
+			 * @desc Base reception template for CREATE RemoteCSE
 			 */
 			template RequestPrimitive mw_createRemoteCSEBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
 				resourceType := int16,
-				primitiveContent := ?//{remoteCSE := m_contentCreateRemoteCSE(p_resourceName, p_accessControlPolicyIds,p_cSEBase, p_cSE_ID)}
+				primitiveContent := {remoteCSE := mw_contentCreateRemoteCSEBase}
 			};
 			
 			/**
@@ -1821,7 +1829,7 @@ module OneM2M_Templates {
 		};
     	
 		/**
-		 * @desc Base primitiveContent for CREATE operation for Container resource
+		 * @desc Base primitiveContent for CREATE operation for RemoteCSE resource
 		 * @param p_name Resource name
 		 */
 		template (value) RemoteCSE_optional m_contentCreateRemoteCSE (in template (omit) XSD.String p_name := c_defaultRemoteCSEResourceName, in template (omit) AcpType p_accessControlPolicyIds, in template (omit) XSD.AnyURI p_cSEBase := PX_CSE1_ID, in template (omit) XSD.ID p_cSE_ID := PX_CSE1_ID):= {
@@ -1846,6 +1854,32 @@ module OneM2M_Templates {
 			nodeLink := omit,//O
 			choice := omit//O
 		};
+		
+		/**
+	  	* @desc Base reception template of primitiveContent for CREATE operation for remoteCSE resource
+	  	*/
+		template RemoteCSE_optional mw_contentCreateRemoteCSEBase := {
+			resourceName := *,//O
+			resourceType := omit,//NP
+			resourceID := omit,//NP
+			parentID := omit,//NP
+			creationTime := omit,//NP
+			lastModifiedTime := omit,//NP
+			labels := *,//O
+			accessControlPolicyIDs := *,//O
+			expirationTime := *,//O
+			announceTo := *,//O
+			announcedAttribute := *,//O
+			cseType := *,//O
+			pointOfAccess := *,//O
+			cSEBase := ?,//M
+			cSE_ID := ?,//M
+			m2M_Ext_ID := *,//O
+			trigger_Recipient_ID := *,//O
+			requestReachability := ?,//M
+			nodeLink := *,//O
+			choice := *//O
+		};
     	
 		/**
 		* @desc Base reception template of primitiveContent for CREATE operation for ContainerAnnc resource
diff --git a/OneM2M_TestControl_IN_profile.ttcn b/OneM2M_TestControl_IN_profile.ttcn
index 082f108..c1758bc 100644
--- a/OneM2M_TestControl_IN_profile.ttcn
+++ b/OneM2M_TestControl_IN_profile.ttcn
@@ -58,6 +58,13 @@ module OneM2M_TestControl_IN_profile {
 		execute(TC_CSE_REG_CRE_019());
 		execute(TC_CSE_REG_CRE_021());
 		execute(TC_CSE_REG_CRE_023());
+		execute(TC_CSE_REG_CRE_024());
+		execute(TC_CSE_REG_CRE_025());
+		execute(TC_CSE_REG_CRE_026_RN());
+		execute(TC_CSE_REG_CRE_026_ET());
+		execute(TC_CSE_REG_CRE_026_LBL());
+		execute(TC_CSE_REG_CRE_026_POA());
+		execute(TC_CSE_REG_CRE_026_NL());
 		execute(TC_CSE_REG_CRE_027());
 		execute(TC_CSE_REG_CRE_028_ET());
 		execute(TC_CSE_REG_CRE_028_LBL());
diff --git a/OneM2M_Testcases_AE.ttcn b/OneM2M_Testcases_AE.ttcn
index c15d875..2e9b60a 100644
--- a/OneM2M_Testcases_AE.ttcn
+++ b/OneM2M_Testcases_AE.ttcn
@@ -73,7 +73,7 @@ module OneM2M_Testcases_AE {
 						var ResponsePrimitive v_responsePrimitive;
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var UtTriggerAckPrimitive v_trigger_response;
-						var charstring v_action := "Please, send a valid CREATE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
 						
 						if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
 							setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -153,7 +153,7 @@ module OneM2M_Testcases_AE {
 						var ResponsePrimitive v_responsePrimitive;
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var UtTriggerAckPrimitive v_trigger_response;
-						var charstring v_action := "Please, send a valid CREATE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope);
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope);
 						
 						
 						//Test Control
@@ -245,7 +245,7 @@ module OneM2M_Testcases_AE {
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
 						var UtTriggerAckPrimitive v_trigger_response;
 						var integer v_auxInteger;
-						var charstring v_action := "Please, send a valid UPDATE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
 						
 						
 						if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
@@ -331,7 +331,7 @@ module OneM2M_Testcases_AE {
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
 						var UtTriggerAckPrimitive v_trigger_response;
 						var integer v_auxInteger;
-						var charstring v_action := "Please, send a valid UPDATE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope);
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope);
 												
 						if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
 							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -422,7 +422,7 @@ module OneM2M_Testcases_AE {
 						var UtTriggerPrimitive v_utRequest;
 						var UtTriggerAckPrimitive v_trigger_response;
 						var integer v_auxInteger;
-						var charstring v_action := "Please, send a valid RETRIEVE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
 						
 						if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
 							setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -508,7 +508,7 @@ module OneM2M_Testcases_AE {
 						var UtTriggerPrimitive v_utRequest;
 						var UtTriggerAckPrimitive v_trigger_response;
 						var integer v_auxInteger;
-						var charstring v_action := "Please, send a valid RETRIEVE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope);
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope);
 						
 						if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
 							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -598,7 +598,7 @@ module OneM2M_Testcases_AE {
 						var template UtTriggerPrimitive v_utRequest := m_utDeleteRequest;
 						var UtTriggerAckPrimitive v_trigger_response;
 						var integer v_auxInteger;
-						var charstring v_action := "Please, send a valid DELETE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
 
 						if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
 							setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -683,7 +683,7 @@ module OneM2M_Testcases_AE {
 						var template UtTriggerPrimitive v_utRequest := m_utDeleteRequest;
 						var UtTriggerAckPrimitive v_trigger_response;
 						var integer v_auxInteger;
-						var charstring v_action := "Please, send a valid DELETE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope);
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope);
 						
 						if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
 							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -745,7 +745,7 @@ module OneM2M_Testcases_AE {
 					//primitives for mcaPortIn
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
-					var charstring v_action := "Please, send a valid AE CREATE Registration Request";
+					var charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request";
 
 					f_cf03Up();
 				
@@ -788,7 +788,7 @@ module OneM2M_Testcases_AE {
 						//primitives for utPort
 						var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
 						var template RequestPrimitive v_createAe := mw_createAe;
-						var charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute ResourceName";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute ResourceName";
 						v_utRequest.primitiveContent.aE.resourceName := "UNINITIALIZED";
 						v_createAe.primitiveContent.aE.resourceName := ?;
 						f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
@@ -798,7 +798,7 @@ module OneM2M_Testcases_AE {
 						//primitives for utPort
 						var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
 						var template RequestPrimitive v_createAe := mw_createAe;
-						var charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute ExpirationTime";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute ExpirationTime";
 						v_utRequest.primitiveContent.aE.expirationTime := "20301231T012345";
 						v_createAe.primitiveContent.aE.expirationTime := ?;
 						f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
@@ -808,7 +808,7 @@ module OneM2M_Testcases_AE {
 						//primitives for utPort
 						var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
 						var template RequestPrimitive v_createAe := mw_createAe;
-						var charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute Labels";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute Labels";
 						v_utRequest.primitiveContent.aE.labels := {"UNINITIALIZED"};
 						v_createAe.primitiveContent.aE.labels := ?;
 						f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
@@ -818,7 +818,7 @@ module OneM2M_Testcases_AE {
 						//primitives for utPort
 						var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
 						var template RequestPrimitive v_createAe := mw_createAe;
-						var charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute AppName";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute AppName";
 						v_utRequest.primitiveContent.aE.appName := "UNINITIALIZED";
 						v_createAe.primitiveContent.aE.appName := ?;
 						f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
@@ -828,7 +828,7 @@ module OneM2M_Testcases_AE {
 						//primitives for utPort
 						var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
 						var template RequestPrimitive v_createAe := mw_createAe;
-						var charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute AppID";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute AppID";
 						v_utRequest.primitiveContent.aE.app_ID := "UNINITIALIZED";
 						v_createAe.primitiveContent.aE.app_ID := ?;
 						f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
@@ -838,7 +838,7 @@ module OneM2M_Testcases_AE {
 						//primitives for utPort
 						var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
 						var template RequestPrimitive v_createAe := mw_createAe;
-						var charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute PointOfAccess";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute PointOfAccess";
 						v_utRequest.primitiveContent.aE.pointOfAccess := {"UNINITIALIZED"};
 						v_createAe.primitiveContent.aE.pointOfAccess := ?;
 						f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
@@ -848,7 +848,7 @@ module OneM2M_Testcases_AE {
 						//primitives for utPort
 						var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
 						var template RequestPrimitive v_createAe := mw_createAe;
-						var charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute OntologyRef";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute OntologyRef";
 						v_utRequest.primitiveContent.aE.ontologyRef := "UNINITIALIZED";
 						v_createAe.primitiveContent.aE.ontologyRef := ?;
 						f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
@@ -858,7 +858,7 @@ module OneM2M_Testcases_AE {
 						//primitives for utPort
 						var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
 						var template RequestPrimitive v_createAe := mw_createAe;
-						var charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute NodeLink";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute NodeLink";
 						v_utRequest.primitiveContent.aE.nodeLink := "UNINITIALIZED";
 						v_createAe.primitiveContent.aE.nodeLink := ?;
 						f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
@@ -868,7 +868,7 @@ module OneM2M_Testcases_AE {
 						//primitives for utPort
 						var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
 						var template RequestPrimitive v_createAe := mw_createAe;
-						var charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute RequestReachability";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute RequestReachability";
 						v_utRequest.primitiveContent.aE.requestReachability := true;
 						v_createAe.primitiveContent.aE.requestReachability := ?;
 						f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
@@ -878,7 +878,7 @@ module OneM2M_Testcases_AE {
 						//primitives for utPort
 						var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
 						var template RequestPrimitive v_createAe := mw_createAe;
-						var charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute ContentSerialization";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute ContentSerialization";
 						v_utRequest.primitiveContent.aE.contentSerialization := {applicationxml};
 						v_createAe.primitiveContent.aE.contentSerialization := ?;
 						f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
@@ -937,7 +937,7 @@ module OneM2M_Testcases_AE {
 					//variables
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
-					var charstring v_action := "Please, send a valid AE DELETE Registration Request";
+					var charstring v_action :=  __SCOPE__ & ": Please, send a valid AE DELETE Registration Request";
 					
 					//primitives for utPort
 					var template UtTriggerPrimitive v_utRequest := mw_deleteRequest;
@@ -990,7 +990,7 @@ module OneM2M_Testcases_AE {
 					var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
-					var charstring v_action := "Please, send a valid CREATE Request for container";
+					var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for container";
 					
 					f_cf03Up();
 	
@@ -1032,7 +1032,7 @@ module OneM2M_Testcases_AE {
 					var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
-					var charstring v_action := "Please, send a valid CREATE Request for ContentInstance";
+					var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance";
 	
 					//Test component configuration
 					f_cf03Up();
@@ -1079,7 +1079,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_CRE_003_CNF() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 						var template RequestPrimitive v_request := mw_createContentInstance;
-						var charstring v_action := "Please, send a valid CREATE Request for ContentInstance containing attribute ContentInfo";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ContentInfo";
 						v_utRequest.primitiveContent.contentInstance.contentInfo := "UNINITIALIZED";
 						v_request.primitiveContent.contentInstance.contentInfo := ?;
 						f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
@@ -1088,7 +1088,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_CRE_003_RN() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 						var template RequestPrimitive v_request := mw_createContentInstance;
-						var charstring v_action := "Please, send a valid CREATE Request for ContentInstance containing attribute ResourceName";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ResourceName";
 						v_utRequest.primitiveContent.contentInstance.resourceName := "UNINITIALIZED";
 						v_request.primitiveContent.contentInstance.resourceName := ?;
 						f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
@@ -1097,7 +1097,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_CRE_003_ET() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 						var template RequestPrimitive v_request := mw_createContentInstance;
-						var charstring v_action := "Please, send a valid CREATE Request for ContentInstance containing attribute ExpirationTime";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ExpirationTime";
 						v_utRequest.primitiveContent.contentInstance.expirationTime := "20301231T012345";
 						v_request.primitiveContent.contentInstance.expirationTime := ?;
 						f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
@@ -1106,7 +1106,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_CRE_003_LBL() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 						var template RequestPrimitive v_request := mw_createContentInstance;
-						var charstring v_action := "Please, send a valid CREATE Request for ContentInstance containing attribute Labels";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute Labels";
 						v_utRequest.primitiveContent.contentInstance.labels := {"UNINITIALIZED"};
 						v_request.primitiveContent.contentInstance.labels := ?;
 						f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
@@ -1115,7 +1115,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_CRE_003_CR() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 						var template RequestPrimitive v_request := mw_createContentInstance;
-						var charstring v_action := "Please, send a valid CREATE Request for ContentInstance containing attribute Creator";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute Creator";
 						v_utRequest.primitiveContent.contentInstance.creator := "UNINITIALIZED";
 						v_request.primitiveContent.contentInstance.creator := ?;
 						f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
@@ -1174,7 +1174,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_CRE_004_ACPI() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
-						var charstring v_action := "Please, send a valid CREATE Request for Container containing attribute AccessControlPolicyIDs";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute AccessControlPolicyIDs";
 						v_utRequest.primitiveContent.container.accessControlPolicyIDs := {"UNINITIALIZED"};
 						v_request.primitiveContent.container.accessControlPolicyIDs := ?;
 						f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
@@ -1183,7 +1183,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_CRE_004_MNI() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
-						var charstring v_action := "Please, send a valid CREATE Request for Container containing attribute MaxNrOfInstances";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxNrOfInstances";
 						v_utRequest.primitiveContent.container.maxNrOfInstances := 1;
 						v_request.primitiveContent.container.maxNrOfInstances := ?;
 						f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
@@ -1192,7 +1192,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_CRE_004_MBS() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
-						var charstring v_action := "Please, send a valid CREATE Request for Container containing attribute MaxByteSize";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxByteSize";
 						v_utRequest.primitiveContent.container.maxByteSize := 1;
 						v_request.primitiveContent.container.maxByteSize := ?;
 						f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
@@ -1201,7 +1201,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_CRE_004_MIA() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
-						var charstring v_action := "Please, send a valid CREATE Request for Container containing attribute MaxInstanceAge";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxInstanceAge";
 						v_utRequest.primitiveContent.container.maxInstanceAge := 1;
 						v_request.primitiveContent.container.maxInstanceAge := ?;
 						f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
@@ -1210,7 +1210,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_CRE_004_OR() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
-						var charstring v_action := "Please, send a valid CREATE Request for Container containing attribute OntologyRef";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute OntologyRef";
 						v_utRequest.primitiveContent.container.ontologyRef := "UNINITIALIZED";
 						v_request.primitiveContent.container.ontologyRef := ?;
 						f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
@@ -1219,7 +1219,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_CRE_004_RN() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
-						var charstring v_action := "Please, send a valid CREATE Request for Container containing attribute ResourceName";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute ResourceName";
 						v_utRequest.primitiveContent.container.resourceName := "UNINITIALIZED";
 						v_request.primitiveContent.container.resourceName := ?;
 						f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
@@ -1228,7 +1228,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_CRE_004_ET() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
-						var charstring v_action := "Please, send a valid CREATE Request for Container containing attribute ExpirationTime";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute ExpirationTime";
 						v_utRequest.primitiveContent.container.expirationTime := "20301231T012345";
 						v_request.primitiveContent.container.expirationTime := ?;
 						f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
@@ -1237,7 +1237,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_CRE_004_LBL() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
-						var charstring v_action := "Please, send a valid CREATE Request for Container containing attribute Labels";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute Labels";
 						v_utRequest.primitiveContent.container.labels := {"UNINITIALIZED"};
 						v_request.primitiveContent.container.labels := ?;
 						f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
@@ -1246,7 +1246,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_CRE_004_CR() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
-						var charstring v_action := "Please, send a valid CREATE Request for Container containing attribute Creator";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute Creator";
 						v_utRequest.primitiveContent.container.creator := "UNINITIALIZED";
 						v_request.primitiveContent.container.creator := ?;
 						f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
@@ -1307,7 +1307,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_UPD_001_LBL() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
 						var template RequestPrimitive v_request := mw_createContainer;
-						var charstring v_action := "Please, send a valid UPDATE Request for Container updating attribute labels";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute labels";
 						v_utRequest.primitiveContent.container.labels := {"UNINITIALIZED"};
 						f_AE_DMR_UPD_001(v_utRequest,v_request,v_action);
 					}
@@ -1368,7 +1368,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_UPD_002_ET() runs on CseSimu system AeSystem {
 						
 						var template UtTriggerPrimitive v_utRequest := m_updateAeBase;
-						var charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute expirationTime";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute expirationTime";
 						
 						v_utRequest.primitiveContent.aE.expirationTime := "20301231T012345";
 						
@@ -1378,7 +1378,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_UPD_002_APN() runs on CseSimu system AeSystem {
 						
 						var template UtTriggerPrimitive v_utRequest := m_updateAeBase;
-						var charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute appName";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute appName";
 						
 						v_utRequest.primitiveContent.aE.appName := "UNINITIALIZED";
 						
@@ -1388,7 +1388,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_UPD_002_POA() runs on CseSimu system AeSystem {
 						
 						var template UtTriggerPrimitive v_utRequest := m_updateAeBase;
-						var charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute pointOfAccess";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute pointOfAccess";
 						
 						v_utRequest.primitiveContent.aE.pointOfAccess := {"http://127.0.0.1:1400/monitor"};
 						
@@ -1398,7 +1398,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_UPD_002_OR() runs on CseSimu system AeSystem {
 						
 						var template UtTriggerPrimitive v_utRequest := m_updateAeBase;
-						var charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute ontologyRef";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute ontologyRef";
 						
 						v_utRequest.primitiveContent.aE.ontologyRef := "MyOntologyRef";
 						
@@ -1408,7 +1408,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_DMR_UPD_002_NL() runs on CseSimu system AeSystem {
 						
 						var template UtTriggerPrimitive v_utRequest := m_updateAeBase;
-						var charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute nodeLink";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute nodeLink";
 						
 						v_utRequest.primitiveContent.aE.nodeLink := "/CSE_ID/S-AE-ID-STEM";
 						
@@ -1417,7 +1417,7 @@ module OneM2M_Testcases_AE {
 	
 					testcase TC_AE_DMR_UPD_002_RR() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_updateAeBase;
-						var charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute requestReachability";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute requestReachability";
 						
 						v_utRequest.primitiveContent.aE.requestReachability := true;
 						
@@ -1426,7 +1426,7 @@ module OneM2M_Testcases_AE {
 	
 					testcase TC_AE_DMR_UPD_002_CSZ() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequestTestBody := m_updateAeBase;
-						var charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute contentSerialization";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute contentSerialization";
 						
 						v_utRequestTestBody.primitiveContent.aE.contentSerialization := {applicationxml};
 						
@@ -1493,7 +1493,7 @@ module OneM2M_Testcases_AE {
 						
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
-						var charstring v_action := "Please, send a valid UPDATE Request for Container updating attribute expirationTime";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute expirationTime";
 						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
 						v_utRequest.primitiveContent.container.expirationTime := "20301231T012345";
 						v_request.primitiveContent.container.expirationTime := ?;
@@ -1505,7 +1505,7 @@ module OneM2M_Testcases_AE {
 						
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
-						var charstring v_action := "Please, send a valid UPDATE Request for Container updating attribute labels";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute labels";
 						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
 						v_utRequest.primitiveContent.container.labels := {"UNINITIALIZED"};
 						v_request.primitiveContent.container.labels := ?;
@@ -1517,7 +1517,7 @@ module OneM2M_Testcases_AE {
 						
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
-						var charstring v_action := "Please, send a valid UPDATE Request for Container updating attribute maxNrOfInstances";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxNrOfInstances";
 						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
 						v_utRequest.primitiveContent.container.maxNrOfInstances := 1;
 						v_request.primitiveContent.container.maxNrOfInstances := ?;
@@ -1529,7 +1529,7 @@ module OneM2M_Testcases_AE {
 						
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
-						var charstring v_action := "Please, send a valid UPDATE Request for Container updating attribute maxByteSize";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxByteSize";
 						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
 						v_utRequest.primitiveContent.container.maxByteSize := 1;
 						v_request.primitiveContent.container.maxByteSize := ?;
@@ -1540,7 +1540,7 @@ module OneM2M_Testcases_AE {
 						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
-						var charstring v_action := "Please, send a valid UPDATE Request for Container updating attribute maxInstanceAge";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxInstanceAge";
                         
 						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
 						v_utRequest.primitiveContent.container.maxInstanceAge := 1;
@@ -1602,19 +1602,19 @@ module OneM2M_Testcases_AE {
 	
 					testcase TC_AE_DMR_RET_001_CB() runs on CseSimu system AeSystem {
 						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentCSEBase(m_contentCreateCSEBase)), int5);
-						var charstring v_action := "Please, send a valid RETRIEVE Request for CSEBase";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for CSEBase";
 						f_AE_DMR_RET_001(int5, f_getResourceAddress(v_auxInteger),v_action);
 					}
 				 	
 					testcase TC_AE_DMR_RET_001_AE() runs on CseSimu system AeSystem {
 						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
-						var charstring v_action := "Please, send a valid RETRIEVE Request for AE";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for AE";
 						f_AE_DMR_RET_001(int2, f_getResourceAddress(v_auxInteger),v_action);
 					}
 					
 					testcase TC_AE_DMR_RET_001_CNT() runs on CseSimu system AeSystem {
 						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer())), int3);
-						var charstring v_action := "Please, send a valid RETRIEVE Request for Container";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for Container";
 						f_AE_DMR_RET_001(int3, f_getResourceAddress(v_auxInteger),v_action);
 					}
 	
@@ -1674,7 +1674,7 @@ module OneM2M_Testcases_AE {
 					var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address & "/" & c_resourceShortNameOldest, "UNINITIALIZED");
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
-					var charstring v_action := "Please, send a valid RETRIEVE Request for retrieving the 'oldest' attribute from Container";
+					var charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the 'oldest' attribute from Container";
 	
 					//Test component configuration
 					f_cf03Up();
@@ -1722,7 +1722,7 @@ module OneM2M_Testcases_AE {
 					var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address & "/" & c_resourceShortNameLatest, "UNINITIALIZED");
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
-					var charstring v_action := "Please, send a valid RETRIEVE Request for retrieving the 'latest' attribute from Container";
+					var charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the 'latest' attribute from Container";
 	
 					//Test component configuration
 					f_cf03Up();
@@ -1770,7 +1770,7 @@ module OneM2M_Testcases_AE {
 					var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address, "UNINITIALIZED");
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
-					var charstring v_action := "Please, send a valid RETRIEVE Request for retrieving the Container";
+					var charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the Container";
 
 					//Test component configuration
 					f_cf03Up();
@@ -1819,7 +1819,7 @@ module OneM2M_Testcases_AE {
 					var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address, "UNINITIALIZED");
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
-					var charstring v_action := "Please, send a valid RETRIEVE Request for retrieving the contentInstance";
+					var charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the contentInstance";
 
 					//Test component configuration
 					f_cf03Up();
@@ -1872,7 +1872,7 @@ module OneM2M_Testcases_AE {
 					var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address & "/" & c_resourceShortNameOldest, "UNINITIALIZED");
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
-					var charstring v_action := "Please, send a valid DELETE Request for deleting the 'oldest' attribute from contentInstance";
+					var charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for deleting the 'oldest' attribute from contentInstance";
 
 					//Test component configuration
 					f_cf03Up();
@@ -1920,7 +1920,7 @@ module OneM2M_Testcases_AE {
 					var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address & "/" & c_resourceShortNameLatest, "UNINITIALIZED");
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
-					var charstring v_action := "Please, send a valid DELETE Request for deleting the 'latest' attribute from contentInstance";
+					var charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for deleting the 'latest' attribute from contentInstance";
 
 					//Test component configuration
 					f_cf03Up();
@@ -1968,7 +1968,7 @@ module OneM2M_Testcases_AE {
 					var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address, "UNINITIALIZED");
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
-					var charstring v_action := "Please, send a valid DELETE Request for deleting the container resource";
+					var charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for deleting the container resource";
 
 					//Test component configuration
 					f_cf03Up();
@@ -2017,7 +2017,7 @@ module OneM2M_Testcases_AE {
 					var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address, "UNINITIALIZED");
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
-					var charstring v_action := "Please, send a valid DELETE Request for deleting the contentInstance resource";
+					var charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for deleting the contentInstance resource";
 
 					//Test component configuration
 					f_cf03Up();
@@ -2072,7 +2072,7 @@ module OneM2M_Testcases_AE {
 					var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
-					var charstring v_action := "Please, send a valid subscription creation request";
+					var charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request";
 				  	
 					var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
 					v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
@@ -2117,7 +2117,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_SUB_CRE_002_ACPI() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
-						var charstring v_action := "Please, send a valid subscription creation request with optional attribute accessControlPolicyIDs";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute accessControlPolicyIDs";
 
 						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
 						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
@@ -2134,7 +2134,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_SUB_CRE_002_ENC() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
-						var charstring v_action := "Please, send a valid subscription creation request with optional attribute createdBefore";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute createdBefore";
 						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
 						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
 						v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
@@ -2151,7 +2151,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_SUB_CRE_002_EXC() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
-						var charstring v_action := "Please, send a valid subscription creation request with optional attribute expirationCounter";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute expirationCounter";
 
 						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
 						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
@@ -2168,7 +2168,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_SUB_CRE_002_NFU() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
-						var charstring v_action := "Please, send a valid subscription creation request with optional attribute notificationForwardingURI";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute notificationForwardingURI";
 
 						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
 						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
@@ -2185,7 +2185,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_SUB_CRE_002_NCT() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
-						var charstring v_action := "Please, send a valid subscription creation request with optional attribute notificationContentType";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute notificationContentType";
 
 						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
 						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
@@ -2202,7 +2202,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_SUB_CRE_002_NEC() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
-						var charstring v_action := "Please, send a valid subscription creation request with optional attribute notificationEventCat";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute notificationEventCat";
 
 						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
 						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
@@ -2219,7 +2219,7 @@ module OneM2M_Testcases_AE {
 					testcase TC_AE_SUB_CRE_002_SU() runs on CseSimu system AeSystem {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 						var template RequestPrimitive v_requestT := mw_createSubscription;
-						var charstring v_action := "Please, send a valid subscription creation request with optional attribute subscriberURI";
+						var charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute subscriberURI";
 
 						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
 						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
@@ -2286,7 +2286,7 @@ module OneM2M_Testcases_AE {
 					var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
-					var charstring v_action := "Please, send a valid AE Registration CREATE Request";
+					var charstring v_action :=  __SCOPE__ & ": Please, send a valid AE Registration CREATE Request";
   	
 					var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
 					v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
@@ -2377,7 +2377,7 @@ module OneM2M_Testcases_AE {
 					var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
 					var MsgIn v_request;
 					var ResponsePrimitive v_responsePrimitive;
-					var charstring v_action := "Please, send a valid AE Registration CREATE Request";
+					var charstring v_action :=  __SCOPE__ & ": Please, send a valid AE Registration CREATE Request";
   	
 					var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
 					v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
diff --git a/OneM2M_Testcases_CSE.ttcn b/OneM2M_Testcases_CSE.ttcn
index 456d467..4fcb88d 100644
--- a/OneM2M_Testcases_CSE.ttcn
+++ b/OneM2M_Testcases_CSE.ttcn
@@ -996,7 +996,7 @@ module OneM2M_Testcases_CSE {
 					f_cf01Up();
 		  	  	
 					//Preambule
-					//vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
+					//vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
 					//TODO: create serviceSubscribedProfile, Node, and serviceSubscribedAppRule
 					//v_cseBaseIndex := f_cse_preamble_createServiceSubscribedProfile({"C*"}); //c_CRUDNDi);
 					
@@ -1044,7 +1044,7 @@ module OneM2M_Testcases_CSE {
 		  	  	
 					//Preambule
 					//v_cseBaseIndex := f_cse_preamble_createServiceSubscribedAppRule({"S"});//c_CRUDNDi);
-					vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
+					vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
 		
 					//Test Body
 					vc_ae1.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, omit)));				
@@ -1096,7 +1096,7 @@ module OneM2M_Testcases_CSE {
 					f_cf02UpCseSimuMaster();
 		  	  	
 					//Preambule
-					vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
+					vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
 					vc_ae1.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, "S")));
 					
 					vc_ae1.done;
@@ -1206,7 +1206,7 @@ module OneM2M_Testcases_CSE {
 					f_cf02Up();
 		  	  	
 					//Preambule
-					vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSEBase));
+					vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSE));
 					vc_cse1.done;
 					
 					v_aeIndex := f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, "S-AE-ID-STEM"));
@@ -1755,7 +1755,7 @@ module OneM2M_Testcases_CSE {
 					// Test adapter configuration
 
 					// Preamble
-					vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSEBase));
+					vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSE));
 
 					// Test Body
 					f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, omit));
@@ -1833,6 +1833,205 @@ module OneM2M_Testcases_CSE {
 				
 				}
 				
+				/**
+				 * @desc Check that IUT sends a CSE registration request with attributes multiplicity equals to 1 
+				 * 
+				 */
+				testcase TC_CSE_REG_CRE_024() runs on CseSimu system CseSystem {
+  
+					// Local variables
+					var ResponsePrimitive v_responsePrimitive;
+					var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
+					var charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with attributes multiplicity equals to 1";
+	   
+					// Test control
+
+					// Test component configuration
+					f_cf04Up();
+
+					// Test adapter configuration
+
+					// Preamble
+					//send triggering primitive to SUT
+					f_sendUtPrimitive(v_utRequest,v_action);
+
+					// Test Body
+					tc_ac.start;
+					alt {
+						[] mccPortIn.receive(mw_request(mw_createRemoteCSEBase)) {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__&":INFO: Resource type remoteCSE created successfuly");
+							
+							//set responseStatusCode back to SUT
+							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+
+							//send back responsePrimitive
+							mccPortIn.send(m_response(v_responsePrimitive));
+						}
+						[] mccPortIn.receive {
+							tc_ac.stop;
+							setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
+						}
+						[] tc_ac.timeout {
+							setverdict(inconc, __SCOPE__&":INFO: No request received for creating resource type remoteCSE");
+						}
+					}	
+					// Postamble
+					f_cse_postamble_deleteResourcesCSE();
+
+					// Tear down
+					f_cf04Down();
+
+				}
+				
+				/**
+				 * @desc Check that IUT accepts a CSE registration request with attributes multiplicity equals to 1 
+				 * 
+				 */
+				testcase TC_CSE_REG_CRE_025() runs on CseSimu system CseSystem {
+	  
+					// Local variables
+					var MsgIn v_response;
+					var RequestPrimitive v_request;
+					var integer v_resourceIndex := -1;
+					var integer v_localResourceIndex := -1;
+					var PrimitiveContent v_remoteCSEResource;
+	   
+					// Test control
+
+					// Test component configuration
+					f_cf04Up();
+
+					// Test adapter configuration
+
+					// Preamble
+					v_request := f_getCreateRequestPrimitive(int16, m_createRemoteCSEBase, -1);
+					mccPort.send(m_request(v_request));
+
+					// Test Body
+					tc_ac.start;
+					alt {
+						[] mccPort.receive(mw_response(mw_responsePrimitiveOK(?))) -> value v_response {
+							tc_ac.stop;
+							setverdict(pass, __SCOPE__&":INFO: Resource type remoteCSE created successfuly");
+							f_checkAttributesToBeSaved(int16, v_request, v_response.primitive.responsePrimitive);
+							v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int16, -1);
+						}
+						[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) {
+							tc_ac.stop;
+							setverdict(inconc, __SCOPE__&":INFO: Error while creating resource type remoteCSE");
+						}
+						[] mccPort.receive {
+							tc_ac.stop;
+							setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
+						}
+						[] tc_ac.timeout {
+							setverdict(inconc, __SCOPE__&":INFO: No answer while creating resource type remoteCSE");
+						}
+					}	
+					// Postamble
+					f_cse_postamble_deleteResourcesCSE();
+
+					// Tear down
+					f_cf04Down();
+	
+				}
+				
+				/**
+				 * @desc Check that IUT sends a CSE registration request with OPTIONAL_ATTRIBUTE attribute 
+				 * 
+				 */
+				
+				group g_CSE_REG_CRE_026 {
+					
+					testcase TC_CSE_REG_CRE_026_RN() runs on CseSimu system CseSystem {
+						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
+						var template RequestPrimitive v_request := mw_createRemoteCSE;
+						var charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute resourceName";
+						v_utRequest.primitiveContent.remoteCSE.resourceName := "UNINITIALIZED";
+						v_request.primitiveContent.remoteCSE.resourceName := ?;
+						f_CSE_REG_CRE_026(v_utRequest,v_request,v_action);
+					}
+					
+					testcase TC_CSE_REG_CRE_026_ET() runs on CseSimu system CseSystem {
+						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
+						var template RequestPrimitive v_request := mw_createRemoteCSE;
+						var charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute expirationTime";
+						v_utRequest.primitiveContent.remoteCSE.expirationTime := "20301231T012345";
+						v_request.primitiveContent.remoteCSE.expirationTime := ?;
+						f_CSE_REG_CRE_026(v_utRequest,v_request,v_action);
+					}
+					
+					testcase TC_CSE_REG_CRE_026_LBL() runs on CseSimu system CseSystem {
+						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
+						var template RequestPrimitive v_request := mw_createRemoteCSE;
+						var charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute labels";
+						v_utRequest.primitiveContent.remoteCSE.labels := {"UNINITIALIZED"};
+						v_request.primitiveContent.remoteCSE.labels := ?;
+						f_CSE_REG_CRE_026(v_utRequest,v_request,v_action);
+					}
+					
+					testcase TC_CSE_REG_CRE_026_POA() runs on CseSimu system CseSystem {
+						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
+						var template RequestPrimitive v_request := mw_createRemoteCSE;
+						var charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute pointOfAccess";
+						v_utRequest.primitiveContent.remoteCSE.pointOfAccess := {"UNINITIALIZED"};
+						v_request.primitiveContent.remoteCSE.pointOfAccess := ?;
+						f_CSE_REG_CRE_026(v_utRequest,v_request,v_action);
+					}
+					
+					testcase TC_CSE_REG_CRE_026_NL() runs on CseSimu system CseSystem {
+						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
+						var template RequestPrimitive v_request := mw_createRemoteCSE;
+						var charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with optional attribute nodeLink";
+						v_utRequest.primitiveContent.remoteCSE.nodeLink := "UNINITIALIZED";
+						v_request.primitiveContent.remoteCSE.nodeLink := ?;
+						f_CSE_REG_CRE_026(v_utRequest,v_request,v_action);
+					}
+					
+					function f_CSE_REG_CRE_026(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in charstring p_action) runs on CseSimu {
+	  
+						var ResponsePrimitive v_responsePrimitive;
+
+						//Test component configuration
+						f_cf04Up();
+
+						//send triggering primitive to SUT
+						f_sendUtPrimitive(p_utRequest,p_action);
+
+						//Test behavior
+						tc_ac.start;
+						alt{
+
+							//receive MsgIn requestPrimitive
+							[] mccPortIn.receive(mw_request(p_request)) {
+								tc_ac.stop;
+								setverdict(pass, __SCOPE__&":INFO: Resource type remoteCSE created successfuly");
+
+								//set responseStatusCode back to SUT
+								v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+
+								//send back responsePrimitive
+								mccPortIn.send(m_response(v_responsePrimitive));
+							}
+							[] mccPortIn.receive {
+								tc_ac.stop;
+								setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
+							}
+							[] tc_ac.timeout {
+								setverdict(inconc, __SCOPE__&":INFO: No request received for creating resource type remoteCSE");
+							}
+						}
+
+						// Postamble
+						f_cse_postamble_deleteResourcesCSE();
+	
+						// Tear down
+						f_cf04Down();
+	
+					}
+				}
+				
 				/*testcase TC_CSE_REG_CRE_029() runs on CseSimu system CseSystem {
   
 					var MsgIn v_response;
@@ -1853,7 +2052,7 @@ module OneM2M_Testcases_CSE {
 	
 					tc_ac.start;
 					alt {
-						[] mccPort.receive(mw_request(mw_createRemoteCSEBase(PX_CSE_ID,f_getResourceAddress(-1)))) -> value v_response {
+						[] mccPort.receive(mw_request(mw_createRemoteCSE(PX_CSE_ID,f_getResourceAddress(-1)))) -> value v_response {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": Resource type remoteCSE created successfully");
 						}
@@ -2749,7 +2948,7 @@ module OneM2M_Testcases_CSE {
 					 var ResourceType v_resourceType := int16;	//remoteCSE
 					 var template PrimitiveContent v_contentResponse;
 					 var template UtTriggerPrimitive v_utRequest;
-					 var charstring v_action := __SCOPE__ & ":" & " Please, send a valid RETRIEVE Request containing To set to " & PX_CSE1_ADDRESS;
+					 var charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request containing To set to " & PX_CSE1_ADDRESS;
 	 		
 					 // Test control
 					 if(not(PICS_MN_CSE)) {
@@ -3102,7 +3301,7 @@ module OneM2M_Testcases_CSE {
 						var RequestPrimitive v_request;
 						var ResourceType v_resourceType := int16;	//remoteCSE
 						var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
-						var charstring v_action := __SCOPE__ & ":" & " Please, send a valid RETRIEVE Request containing To set to " & PX_CSE1_ADDRESS & " and Content containing remoteCSE resource containing a valid attribute " & p_attribute[0];								
+						var charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request containing To set to " & PX_CSE1_ADDRESS & " and Content containing remoteCSE resource containing a valid attribute " & p_attribute[0];								
 						// Test control
 						if(not(PICS_MN_CSE)) {
 							setverdict(inconc, __SCOPE__ & ": IUT shall be MN-CSE to run this test case");
@@ -3226,7 +3425,7 @@ module OneM2M_Testcases_CSE {
 					// Test adapter configuration
 
 					// Preamble
-					vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
+					vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
 
 					// Test Body
 					v_request := valueof(m_delete(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex)));
@@ -3325,7 +3524,7 @@ module OneM2M_Testcases_CSE {
 					var template UtTriggerPrimitive v_utRequest := m_utDeleteRequest;
 					var UtTriggerAckPrimitive v_trigger_response;
 					var integer v_auxInteger;
-					var charstring v_action := __SCOPE__ & ":" & " Please, send a valid DELETE Request containing To set to " & PX_CSE1_ADDRESS;
+					var charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request containing To set to " & PX_CSE1_ADDRESS;
 					// Test control
 
 					// Test component configuration
@@ -3334,7 +3533,7 @@ module OneM2M_Testcases_CSE {
 					// Test adapter configuration
 
 					// Preamble
-					vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
+					vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
 					
 					//Send Trigger Message
 					v_auxInteger := f_setResource(valueof(m_primitiveContentRemoteCSE(m_contentCreateRemoteCSE(omit,omit,omit,omit))), int16);
-- 
GitLab