From 1e69727948b46cc2e5bce8be26ad82d62a4c3160 Mon Sep 17 00:00:00 2001
From: acverdugo <acverdugo@at4wireless.com>
Date: Thu, 23 Nov 2017 11:43:36 +0100
Subject: [PATCH] Trigger RemoteCSE creation on f_cse_registrationRemoteCse
 Fixed m_utCreateRemoteCSE Typo issues

Signed-off-by: acverdugo <acverdugo@at4wireless.com>
---
 LibOneM2M/OneM2M_Functions.ttcn |  23 ++--
 LibOneM2M/OneM2M_Templates.ttcn |   3 +-
 OneM2M_Testcases_AE.ttcn        | 234 ++++++++++++++++----------------
 3 files changed, 134 insertions(+), 126 deletions(-)

diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 6f1015d..03c9404 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -1609,6 +1609,11 @@ module OneM2M_Functions {
 				var PrimitiveContent v_remoteCSEResource;
 				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";
+				
+				//send triggering primitive to SUT
+			  	f_sendUtPrimitive(v_utRequest,v_action);
 
 				tc_ac.start;
 				alt {
@@ -1684,11 +1689,12 @@ module OneM2M_Functions {
 				
 				// TODO To review the code (use of indexes, generation of value for certain attributes, etc..)
 				if(p_resourceType == int5) {	//CSEBase
-					v_myResource.cSEBase.resourceName := "CSEBase";
+					v_myResource.cSEBase.resourceName := "CSEBase" & int2str(v_resourceIndex);
 					v_myResource.cSEBase.resourceType := p_resourceType;
-					v_myResource.cSEBase.resourceID := "CSEBase";
+					v_myResource.cSEBase.resourceID := "CSEBase" & int2str(v_resourceIndex);
 					v_myResource.cSEBase.parentID := omit;		//Following TS-0001, it must be NULL
-					v_myResource.cSEBase.creationTime := fx_generateTimestamp();
+					//v_myResource.cSEBase.creationTime := fx_generateTimestamp();
+					v_myResource.cSEBase.creationTime := "20171231T012345";
 					v_myResource.cSEBase.lastModifiedTime := v_myResource.cSEBase.creationTime;		
 					v_myResource.cSEBase.cSE_ID := PX_CSE1_ID;
 					v_myResource.cSEBase.supportedResourceType := PX_CSE1_SRT;
@@ -1704,12 +1710,13 @@ module OneM2M_Functions {
 						v_myResource.remoteCSE := p_resource.remoteCSE;
 						
 						if(not(ispresent(p_resource.remoteCSE.resourceName))) {
-							v_myResource.remoteCSE.resourceName := "remoteCSE" & int2char(v_resourceIndex);
+							v_myResource.remoteCSE.resourceName := "remoteCSE" & int2str(v_resourceIndex);
 						}
 						v_myResource.remoteCSE.resourceType := p_resourceType;
-						v_myResource.remoteCSE.resourceID := "remoteCSE" & int2char(v_resourceIndex);
+						v_myResource.remoteCSE.resourceID := "remoteCSE" & int2str(v_resourceIndex);
 						v_myResource.remoteCSE.parentID := f_getResourceId(vc_localResourcesList[p_parentIndex].resource);
-						v_myResource.remoteCSE.creationTime := fx_generateTimestamp();
+						//v_myResource.remoteCSE.creationTime := fx_generateTimestamp();
+						v_myResource.remoteCSE.creationTime := "20171231T012345";
 						if(not(ispresent(p_resource.remoteCSE.expirationTime))) {
 							v_myResource.remoteCSE.expirationTime := "20301231T012345";
 						}
@@ -1721,10 +1728,10 @@ module OneM2M_Functions {
 							//TODO Create a pollingChannel resource
 							v_myResource.remoteCSE.pointOfAccess := omit;
 						}	
-						if(vc_localResourcesList[v_resourceIndex].resourceType == int5) {
+						/*if(vc_localResourcesList[v_resourceIndex].resourceType == int5) {
 							v_myResource.remoteCSE.m2M_Ext_ID := omit;	
 							v_myResource.remoteCSE.trigger_Recipient_ID:= omit;
-						}
+						}*/
 						v_myResource.remoteCSE.nodeLink := omit;
 				    
 					}
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 200d7ec..c331bfb 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -3721,7 +3721,8 @@ module OneM2M_Templates {
 		
 		template (value) UtTriggerPrimitive m_utCreateRemoteCSE modifies m_utCreate := {
 			requestIdentifier := testcasename() & "-m_utCreateRemoteCSE" & f_rnd(1, 1000000),
-			resourceType := int16
+			resourceType := int16,
+			primitiveContent := {remoteCSE := m_contentRemoteCSE_allOmit}
 		}
  		
 		template (value) UtTriggerPrimitive m_utRetrieveResource(XSD.ID p_targetResourceAddress, in XSD.ID p_originator) := {
diff --git a/OneM2M_Testcases_AE.ttcn b/OneM2M_Testcases_AE.ttcn
index 6a39dfb..ef843f4 100644
--- a/OneM2M_Testcases_AE.ttcn
+++ b/OneM2M_Testcases_AE.ttcn
@@ -70,7 +70,7 @@ module OneM2M_Testcases_AE {
 					
 					function f_AE_GEN_CRE_001(PrimitiveScope p_primitiveScope) runs on CseSimu {
 						
-						var ResponsePrimitive v_responsePrimtive;
+						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);
@@ -93,8 +93,8 @@ module OneM2M_Testcases_AE {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container creation request received successfuly");
 							
-								v_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
-								mcaPort.send(m_response(v_responsePrimtive));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+								mcaPort.send(m_response(v_responsePrimitive));
 							}
 							[] mcaPort.receive(mw_request(?)) {
 								tc_ac.stop;
@@ -150,7 +150,7 @@ module OneM2M_Testcases_AE {
 
 					function f_AE_GEN_CRE_002(PrimitiveScope p_primitiveScope) runs on CseSimu {
 	
-						var ResponsePrimitive v_responsePrimtive;
+						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);
@@ -176,8 +176,8 @@ module OneM2M_Testcases_AE {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container creation request received successfuly");
 		
-								v_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
-								mcaPort.send(m_response(v_responsePrimtive));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+								mcaPort.send(m_response(v_responsePrimitive));
 							}
 							[] mcaPort.receive(mw_request(?)) {
 								tc_ac.stop;
@@ -241,7 +241,7 @@ module OneM2M_Testcases_AE {
 					
 					function f_AE_GEN_UPD_001(PrimitiveScope p_primitiveScope) runs on CseSimu {
 						
-						var ResponsePrimitive v_responsePrimtive;
+						var ResponsePrimitive v_responsePrimitive;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
 						var UtTriggerAckPrimitive v_trigger_response;
 						var integer v_auxInteger;
@@ -267,8 +267,8 @@ module OneM2M_Testcases_AE {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container update request received successfuly");
 							
-								v_responsePrimtive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
-								mcaPort.send(m_response(v_responsePrimtive));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
+								mcaPort.send(m_response(v_responsePrimitive));
 							}
 							[] mcaPort.receive(mw_request(?)) {
 								tc_ac.stop;
@@ -327,7 +327,7 @@ module OneM2M_Testcases_AE {
 
 					function f_AE_GEN_UPD_002(PrimitiveScope p_primitiveScope) runs on CseSimu {
 	
-						var ResponsePrimitive v_responsePrimtive;
+						var ResponsePrimitive v_responsePrimitive;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
 						var UtTriggerAckPrimitive v_trigger_response;
 						var integer v_auxInteger;
@@ -352,8 +352,8 @@ module OneM2M_Testcases_AE {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container update request received successfuly");
 							
-								v_responsePrimtive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
-								mcaPort.send(m_response(v_responsePrimtive));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
+								mcaPort.send(m_response(v_responsePrimitive));
 							}
 							[] mcaPort.receive(mw_request(?)) {
 								tc_ac.stop;
@@ -417,7 +417,7 @@ module OneM2M_Testcases_AE {
 		
 					function f_AE_GEN_RET_001(PrimitiveScope p_primitiveScope) runs on CseSimu {
 			
-						var ResponsePrimitive v_responsePrimtive;
+						var ResponsePrimitive v_responsePrimitive;
 						var template UtTriggerPrimitive v_utRequestTemplate;
                         var UtTriggerPrimitive v_utRequest;
 						var UtTriggerAckPrimitive v_trigger_response;
@@ -443,8 +443,8 @@ module OneM2M_Testcases_AE {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container retrieve request received successfuly");
 				
-								v_responsePrimtive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
-								mcaPort.send(m_response(v_responsePrimtive));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
+								mcaPort.send(m_response(v_responsePrimitive));
 							}
 							[] mcaPort.receive(mw_request(?)) {
 								tc_ac.stop;
@@ -503,7 +503,7 @@ module OneM2M_Testcases_AE {
 
 					function f_AE_GEN_RET_002(PrimitiveScope p_primitiveScope) runs on CseSimu {
 
-						var ResponsePrimitive v_responsePrimtive;
+						var ResponsePrimitive v_responsePrimitive;
 						var template UtTriggerPrimitive v_utRequestTemplate;
                         var UtTriggerPrimitive v_utRequest;
 						var UtTriggerAckPrimitive v_trigger_response;
@@ -529,8 +529,8 @@ module OneM2M_Testcases_AE {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container retrieve request received successfuly");
 				
-								v_responsePrimtive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
-								mcaPort.send(m_response(v_responsePrimtive));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
+								mcaPort.send(m_response(v_responsePrimitive));
 							}
 							[] mcaPort.receive(mw_request(?)) {
 								tc_ac.stop;
@@ -594,7 +594,7 @@ module OneM2M_Testcases_AE {
 		
 					function f_AE_GEN_DEL_001(PrimitiveScope p_primitiveScope) runs on CseSimu {
 			
-						var ResponsePrimitive v_responsePrimtive;
+						var ResponsePrimitive v_responsePrimitive;
 						var template UtTriggerPrimitive v_utRequest := m_utDeleteRequest;
 						var UtTriggerAckPrimitive v_trigger_response;
 						var integer v_auxInteger;
@@ -619,8 +619,8 @@ module OneM2M_Testcases_AE {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container update request received successfuly");
 				
-								v_responsePrimtive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
-								mcaPort.send(m_response(v_responsePrimtive));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
+								mcaPort.send(m_response(v_responsePrimitive));
 							}
 							[] mcaPort.receive(mw_request(?)) {
 								tc_ac.stop;
@@ -679,7 +679,7 @@ module OneM2M_Testcases_AE {
 
 					function f_AE_GEN_DEL_002(PrimitiveScope p_primitiveScope) runs on CseSimu {
 
-						var ResponsePrimitive v_responsePrimtive;
+						var ResponsePrimitive v_responsePrimitive;
 						var template UtTriggerPrimitive v_utRequest := m_utDeleteRequest;
 						var UtTriggerAckPrimitive v_trigger_response;
 						var integer v_auxInteger;
@@ -705,8 +705,8 @@ module OneM2M_Testcases_AE {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container update request received successfuly");
 				
-								v_responsePrimtive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
-								mcaPort.send(m_response(v_responsePrimtive));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
+								mcaPort.send(m_response(v_responsePrimitive));
 							}
 							[] mcaPort.receive(mw_request(?)) {
 								tc_ac.stop;
@@ -744,7 +744,7 @@ module OneM2M_Testcases_AE {
 
 					//primitives for mcaPort
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
+					var ResponsePrimitive v_responsePrimitive;
 					var charstring v_action := "Please, send a valid AE CREATE Registration Request";
 
 					f_cf03Up();
@@ -758,11 +758,11 @@ module OneM2M_Testcases_AE {
 						[] mcaPort.receive(mw_request(mw_createAe)) -> value v_request {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
-							//v_responsePrimtive := valueof(m_responsePrimitiveTemp(int2000, omit));
-							v_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+							//v_responsePrimitive := valueof(m_responsePrimitiveTemp(int2000, omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 							
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimtive));
+							mcaPort.send(m_response(v_responsePrimitive));
 						}
 						[] mcaPort.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {
 							tc_ac.stop;
@@ -888,7 +888,7 @@ module OneM2M_Testcases_AE {
 	
 					   //primitives for mcaPort
 					   var MsgIn v_request;
-					   var ResponsePrimitive v_responsePrimtive;
+					   var ResponsePrimitive v_responsePrimitive;
 	
 					   f_cf03Up();
 	
@@ -901,11 +901,11 @@ module OneM2M_Testcases_AE {
 						   [] mcaPort.receive(mw_request(p_response)) -> value v_request {
 							   tc_ac.stop;
 							   setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
-							   //v_responsePrimtive := valueof(m_responsePrimitiveTemp(int2000, omit));
-							   v_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+							   //v_responsePrimitive := valueof(m_responsePrimitiveTemp(int2000, omit));
+							   v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 	
 							   //send back responsePrimitive
-							   mcaPort.send(m_response(v_responsePrimtive));
+							   mcaPort.send(m_response(v_responsePrimitive));
 						   }
 						   [] mcaPort.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {
 							   tc_ac.stop;
@@ -936,7 +936,7 @@ module OneM2M_Testcases_AE {
 	
 					//variables
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
+					var ResponsePrimitive v_responsePrimitive;
 					var charstring v_action := "Please, send a valid AE DELETE Registration Request";
 					
 					//primitives for utPort
@@ -953,11 +953,11 @@ module OneM2M_Testcases_AE {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, " : AE deregistration request is accepted!");
 	
-							//v_responsePrimtive := valueof(m_responsePrimitiveTemp(int2000, omit));
-							v_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+							//v_responsePrimitive := valueof(m_responsePrimitiveTemp(int2000, omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 	
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimtive));
+							mcaPort.send(m_response(v_responsePrimitive));
 						}
 						[] mcaPort.receive {
 							tc_ac.stop;
@@ -989,12 +989,12 @@ module OneM2M_Testcases_AE {
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
+					var ResponsePrimitive v_responsePrimitive;
 					var charstring v_action := "Please, send a valid CREATE Request for container";
 					
 					f_cf03Up();
 	
-					//send triggering primtive to SUT
+					//send triggering primitive to SUT
 					f_sendUtPrimitive(v_utRequest,v_action);
 					
 					//Test behavior
@@ -1005,10 +1005,10 @@ module OneM2M_Testcases_AE {
 							setverdict(pass, __SCOPE__, " : Container creation request is accepted!");
 	
 							//set responseStatusCode back to SUT
-							v_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 							
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimtive));
+							mcaPort.send(m_response(v_responsePrimitive));
 						}
 						[] mcaPort.receive {
 							tc_ac.stop;
@@ -1031,13 +1031,13 @@ module OneM2M_Testcases_AE {
 	
 					var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
+					var ResponsePrimitive v_responsePrimitive;
 					var charstring v_action := "Please, send a valid CREATE Request for ContentInstance";
 	
 					//Test component configuration
 					f_cf03Up();
 	
-					//send triggering primtive to SUT
+					//send triggering primitive to SUT
 					f_sendUtPrimitive(v_utRequest,v_action);
 	
 					//Test behavior
@@ -1050,10 +1050,10 @@ module OneM2M_Testcases_AE {
 							setverdict(pass, __SCOPE__, " : ContentInstance creation request is accepted!!");
 							
 							//set responseStatusCode back to SUT
-							v_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 	
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimtive));
+							mcaPort.send(m_response(v_responsePrimitive));
 						}
 	
 						[] mcaPort.receive {
@@ -1123,12 +1123,12 @@ module OneM2M_Testcases_AE {
 	
 					function f_AE_DMR_CRE_003(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in charstring p_action) runs on CseSimu {
 	
-						var ResponsePrimitive v_responsePrimtive;
+						var ResponsePrimitive v_responsePrimitive;
 	
 						//Test component configuration
 						f_cf03Up();
 	
-						//send triggering primtive to SUT
+						//send triggering primitive to SUT
 						f_sendUtPrimitive(p_utRequest,p_action);
 	
 						//Test behavior
@@ -1141,10 +1141,10 @@ module OneM2M_Testcases_AE {
 								setverdict(pass, __SCOPE__, " : ContentInstance creation request is accepted!!");
 	
 								//set responseStatusCode back to SUT
-								v_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 	
 								//send back responsePrimitive
-								mcaPort.send(m_response(v_responsePrimtive));
+								mcaPort.send(m_response(v_responsePrimitive));
 							}
 	
 							[] mcaPort.receive {
@@ -1254,12 +1254,12 @@ module OneM2M_Testcases_AE {
 	
 					function f_AE_DMR_CRE_004(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in charstring p_action) runs on CseSimu {
 	
-						var ResponsePrimitive v_responsePrimtive;
+						var ResponsePrimitive v_responsePrimitive;
 	
 						//Test component configuration
 						f_cf03Up();
 	
-						//send triggering primtive to SUT
+						//send triggering primitive to SUT
 						f_sendUtPrimitive(p_utRequest,p_action);
 	
 						//Test behavior
@@ -1272,10 +1272,10 @@ module OneM2M_Testcases_AE {
 								setverdict(pass, __SCOPE__, " : Container creation request is accepted!!");
 	
 								//set responseStatusCode back to SUT
-								v_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 	
 								//send back responsePrimitive
-								mcaPort.send(m_response(v_responsePrimtive));
+								mcaPort.send(m_response(v_responsePrimitive));
 							}
 	
 							[] mcaPort.receive {
@@ -1314,13 +1314,13 @@ module OneM2M_Testcases_AE {
 			
 					function f_AE_DMR_UPD_001(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in charstring p_action) runs on CseSimu {
 			
-						var ResponsePrimitive v_responsePrimtive;
+						var ResponsePrimitive v_responsePrimitive;
 						var MsgIn v_request;
 			
 						//Test component configuration
 						f_cf03Up();
 			
-						//send triggering primtive to SUT
+						//send triggering primitive to SUT
 						f_sendUtPrimitive(p_utRequest,p_action);
 			
 						//Test behavior
@@ -1336,10 +1336,10 @@ module OneM2M_Testcases_AE {
 									setverdict(fail, __SCOPE__, " : Container update request didn't change the value of the attribute");
 								}else{
 									//set responseStatusCode back to SUT
-									v_responsePrimtive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
+									v_responsePrimitive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
 			
 									//send back responsePrimitive
-									mcaPort.send(m_response(v_responsePrimtive));
+									mcaPort.send(m_response(v_responsePrimitive));
 								}
 							}
 			
@@ -1437,7 +1437,7 @@ module OneM2M_Testcases_AE {
 	
 					   	//primitives for mcaPort
 					   	var MsgIn v_request;
-					   	var ResponsePrimitive v_responsePrimtive;
+					   	var ResponsePrimitive v_responsePrimitive;
 					   	var integer v_aeIndex := -1;
 						var template RequestPrimitive v_expectedUpdateRequestAe := mw_updateAe();
 						
@@ -1461,10 +1461,10 @@ module OneM2M_Testcases_AE {
 						   [] mcaPort.receive(mw_request(v_expectedUpdateRequestAe)) -> value v_request {
 							   tc_ac.stop;
 							   setverdict(pass, __SCOPE__, " : AE registration update request is accepted!");
-							   v_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+							   v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 	
 							   //send back responsePrimitive
-							   mcaPort.send(m_response(v_responsePrimtive));
+							   mcaPort.send(m_response(v_responsePrimitive));
 						   }
 						   [] mcaPort.receive(mw_request(?)) -> value v_request {
 							   tc_ac.stop;
@@ -1550,12 +1550,12 @@ module OneM2M_Testcases_AE {
 
 					function f_AE_DMR_UPD_003(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in charstring p_action) runs on CseSimu {
 
-						var ResponsePrimitive v_responsePrimtive;
+						var ResponsePrimitive v_responsePrimitive;
 
 						//Test component configuration
 						f_cf03Up();
 
-						//send triggering primtive to SUT
+						//send triggering primitive to SUT
 						f_sendUtPrimitive(p_utRequest,p_action);
 
 						//Test behavior
@@ -1568,10 +1568,10 @@ module OneM2M_Testcases_AE {
 								setverdict(pass, __SCOPE__, " : Container update request is accepted!!");
 
 								//set responseStatusCode back to SUT
-								v_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 
 								//send back responsePrimitive
-								mcaPort.send(m_response(v_responsePrimtive));
+								mcaPort.send(m_response(v_responsePrimitive));
 							}
 
 							[] mcaPort.receive {
@@ -1617,12 +1617,12 @@ module OneM2M_Testcases_AE {
 						//variables
 						var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (p_address, "UNINITIALIZED");
 						var MsgIn v_request;
-						var ResponsePrimitive v_responsePrimtive;
+						var ResponsePrimitive v_responsePrimitive;
 		
 						//Test component configuration
 						f_cf03Up();
 		
-						//send triggering primtive to SUT
+						//send triggering primitive to SUT
 						v_utRequest.resourceType := p_resourceType;
 						f_sendUtPrimitive(v_utRequest,p_action);
 						
@@ -1634,10 +1634,10 @@ module OneM2M_Testcases_AE {
 								setverdict(pass, __SCOPE__, " : retrieve ressource type " & int2str(enum2int(v_request.primitive.requestPrimitive.resourceType)) & " request is accepted!!");
 								
 								//set responseStatusCode back to SUT
-								v_responsePrimtive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
 		
 								//send back responsePrimitive
-								mcaPort.send(m_response(v_responsePrimtive));
+								mcaPort.send(m_response(v_responsePrimitive));
 								tc_ac.stop;
 							}
 							[] mcaPort.receive {
@@ -1667,13 +1667,13 @@ module OneM2M_Testcases_AE {
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address & "/" & c_resourceShortNameOldest, "UNINITIALIZED");
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
+					var ResponsePrimitive v_responsePrimitive;
 					var charstring v_action := "Please, send a valid RETRIEVE Request for retrieving the 'oldest' attribute from Container";
 	
 					//Test component configuration
 					f_cf03Up();
 	
-					//send triggering primtive to SUT
+					//send triggering primitive to SUT
 					f_sendUtPrimitive(v_utRequest,v_action);
 	
 					//Test behavior
@@ -1684,10 +1684,10 @@ module OneM2M_Testcases_AE {
 							setverdict(pass, __SCOPE__, " : retrieve attribute oldest request is accepted!");
 	
 							//set responseStatusCode back to SUT
-							v_responsePrimtive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
 	
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimtive));
+							mcaPort.send(m_response(v_responsePrimitive));
 							tc_ac.stop;
 						}
 						[] mcaPort.receive {
@@ -1715,13 +1715,13 @@ module OneM2M_Testcases_AE {
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address & "/" & c_resourceShortNameLatest, "UNINITIALIZED");
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
+					var ResponsePrimitive v_responsePrimitive;
 					var charstring v_action := "Please, send a valid RETRIEVE Request for retrieving the 'latest' attribute from Container";
 	
 					//Test component configuration
 					f_cf03Up();
 	
-					//send triggering primtive to SUT
+					//send triggering primitive to SUT
 					f_sendUtPrimitive(v_utRequest,v_action);
 	
 					//Test behavior
@@ -1732,10 +1732,10 @@ module OneM2M_Testcases_AE {
 							setverdict(pass, __SCOPE__, " : retrieve attribute latest request is accepted!!");
 	
 							//set responseStatusCode back to SUT
-							v_responsePrimtive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
 	
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimtive));
+							mcaPort.send(m_response(v_responsePrimitive));
 							tc_ac.stop;
 						}
 						[] mcaPort.receive {
@@ -1763,13 +1763,13 @@ module OneM2M_Testcases_AE {
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address, "UNINITIALIZED");
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
+					var ResponsePrimitive v_responsePrimitive;
 					var charstring v_action := "Please, send a valid RETRIEVE Request for retrieving the Container";
 
 					//Test component configuration
 					f_cf03Up();
 
-					//send triggering primtive to SUT
+					//send triggering primitive to SUT
 					v_utRequest.resourceType := int3;
 					f_sendUtPrimitive(v_utRequest,v_action);
 	
@@ -1781,10 +1781,10 @@ module OneM2M_Testcases_AE {
 							setverdict(pass, __SCOPE__, " : retrieve ressource type " & int2str(enum2int(v_request.primitive.requestPrimitive.resourceType)) & " request is accepted!!");
 			
 							//set responseStatusCode back to SUT
-							v_responsePrimtive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
 
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimtive));
+							mcaPort.send(m_response(v_responsePrimitive));
 							tc_ac.stop;
 						}
 						[] mcaPort.receive {
@@ -1812,13 +1812,13 @@ module OneM2M_Testcases_AE {
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address, "UNINITIALIZED");
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
+					var ResponsePrimitive v_responsePrimitive;
 					var charstring v_action := "Please, send a valid RETRIEVE Request for retrieving the contentInstance";
 
 					//Test component configuration
 					f_cf03Up();
 
-					//send triggering primtive to SUT
+					//send triggering primitive to SUT
 					v_utRequest.resourceType := int4;
 					f_sendUtPrimitive(v_utRequest,v_action);
 
@@ -1830,10 +1830,10 @@ module OneM2M_Testcases_AE {
 							setverdict(pass, __SCOPE__, " : retrieve ressource type " & int2str(enum2int(v_request.primitive.requestPrimitive.resourceType)) & " request is accepted!!");
 
 							//set responseStatusCode back to SUT
-							v_responsePrimtive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
 
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimtive));
+							mcaPort.send(m_response(v_responsePrimitive));
 							tc_ac.stop;
 						}
 						[] mcaPort.receive {
@@ -1865,13 +1865,13 @@ module OneM2M_Testcases_AE {
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address & "/" & c_resourceShortNameOldest, "UNINITIALIZED");
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
+					var ResponsePrimitive v_responsePrimitive;
 					var charstring v_action := "Please, send a valid DELETE Request for deleting the 'oldest' attribute from contentInstance";
 
 					//Test component configuration
 					f_cf03Up();
 
-					//send triggering primtive to SUT
+					//send triggering primitive to SUT
 					f_sendUtPrimitive(v_utRequest,v_action);
 
 					//Test behavior
@@ -1882,10 +1882,10 @@ module OneM2M_Testcases_AE {
 							setverdict(pass, __SCOPE__, " : delete attribute oldest request is accepted!!");
 
 							//set responseStatusCode back to SUT
-							v_responsePrimtive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
 
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimtive));
+							mcaPort.send(m_response(v_responsePrimitive));
 							tc_ac.stop;
 						}
 						[] mcaPort.receive {
@@ -1913,13 +1913,13 @@ module OneM2M_Testcases_AE {
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address & "/" & c_resourceShortNameLatest, "UNINITIALIZED");
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
+					var ResponsePrimitive v_responsePrimitive;
 					var charstring v_action := "Please, send a valid DELETE Request for deleting the 'latest' attribute from contentInstance";
 
 					//Test component configuration
 					f_cf03Up();
 
-					//send triggering primtive to SUT
+					//send triggering primitive to SUT
 					f_sendUtPrimitive(v_utRequest,v_action);
 
 					//Test behavior
@@ -1930,10 +1930,10 @@ module OneM2M_Testcases_AE {
 							setverdict(pass, __SCOPE__, " : delete attribute latest request is accepted!!");
 
 							//set responseStatusCode back to SUT
-							v_responsePrimtive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
 
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimtive));
+							mcaPort.send(m_response(v_responsePrimitive));
 							tc_ac.stop;
 						}
 						[] mcaPort.receive {
@@ -1961,13 +1961,13 @@ module OneM2M_Testcases_AE {
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address, "UNINITIALIZED");
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
+					var ResponsePrimitive v_responsePrimitive;
 					var charstring v_action := "Please, send a valid DELETE Request for deleting the container resource";
 
 					//Test component configuration
 					f_cf03Up();
 
-					//send triggering primtive to SUT
+					//send triggering primitive to SUT
 					v_utRequest.resourceType := int3;
 					f_sendUtPrimitive(v_utRequest,v_action);
 
@@ -1979,10 +1979,10 @@ module OneM2M_Testcases_AE {
 							setverdict(pass, __SCOPE__, " : delete ressource type " & int2str(enum2int(v_request.primitive.requestPrimitive.resourceType)) & " request is accepted!!");
 
 							//set responseStatusCode back to SUT
-							v_responsePrimtive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
 
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimtive));
+							mcaPort.send(m_response(v_responsePrimitive));
 							tc_ac.stop;
 						}
 						[] mcaPort.receive {
@@ -2010,13 +2010,13 @@ module OneM2M_Testcases_AE {
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address, "UNINITIALIZED");
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
+					var ResponsePrimitive v_responsePrimitive;
 					var charstring v_action := "Please, send a valid DELETE Request for deleting the contentInstance resource";
 
 					//Test component configuration
 					f_cf03Up();
 
-					//send triggering primtive to SUT
+					//send triggering primitive to SUT
 					v_utRequest.resourceType := int4;
 					f_sendUtPrimitive(v_utRequest,v_action);
 
@@ -2028,10 +2028,10 @@ module OneM2M_Testcases_AE {
 							setverdict(pass, __SCOPE__, " : delete ressource type " & int2str(enum2int(v_request.primitive.requestPrimitive.resourceType)) & " request is accepted!!");
 
 							//set responseStatusCode back to SUT
-							v_responsePrimtive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
 
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimtive));
+							mcaPort.send(m_response(v_responsePrimitive));
 							tc_ac.stop;
 						}
 						[] mcaPort.receive {
@@ -2065,7 +2065,7 @@ module OneM2M_Testcases_AE {
 					//variables
 				  	var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
 				  	var MsgIn v_request;
-				  	var ResponsePrimitive v_responsePrimtive;
+				  	var ResponsePrimitive v_responsePrimitive;
 					var charstring v_action := "Please, send a valid subscription creation request";
 				  	
 					var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
@@ -2073,7 +2073,7 @@ module OneM2M_Testcases_AE {
 
 				  	f_cf03Up();
 
-				  	//send triggering primtive to SUT
+				  	//send triggering primitive to SUT
 				  	f_sendUtPrimitive(v_utRequest,v_action);
 				  	
 				  	//Test behavior
@@ -2084,10 +2084,10 @@ module OneM2M_Testcases_AE {
 						  	setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
 
 						  	//set responseStatusCode back to SUT
-						 	v_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+						 	v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 		
 						  	//send back responsePrimitive
-						  	mcaPort.send(m_response(v_responsePrimtive));
+						  	mcaPort.send(m_response(v_responsePrimitive));
 					  	}
 					  	[] mcaPort.receive {
 						  	tc_ac.stop;
@@ -2230,11 +2230,11 @@ module OneM2M_Testcases_AE {
 					function f_AE_SUB_CRE_002(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in charstring p_action) runs on CseSimu {
 	
 						var MsgIn v_request;
-						var ResponsePrimitive v_responsePrimtive;
+						var ResponsePrimitive v_responsePrimitive;
 
 						f_cf03Up();
 
-						//send triggering primtive to SUT
+						//send triggering primitive to SUT
 						f_sendUtPrimitive(p_utRequest,p_action);
 
 						//Test behavior
@@ -2245,10 +2245,10 @@ module OneM2M_Testcases_AE {
 								setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
 
 								//set responseStatusCode back to SUT
-								v_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+								v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 
 								//send back responsePrimitive
-								mcaPort.send(m_response(v_responsePrimtive));
+								mcaPort.send(m_response(v_responsePrimitive));
 							}
 							[] mcaPort.receive {
 								tc_ac.stop;
@@ -2279,7 +2279,7 @@ module OneM2M_Testcases_AE {
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
+					var ResponsePrimitive v_responsePrimitive;
 					var charstring v_action := "Please, send a valid AE Registration CREATE Request";
   	
 					var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
@@ -2294,10 +2294,10 @@ module OneM2M_Testcases_AE {
 						[] mcaPort.receive(mw_request(mw_createAe)) -> value v_request {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
-							v_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 			
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimtive));
+							mcaPort.send(m_response(v_responsePrimitive));
 						} 
 						[] mcaPort.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {
 							tc_ac.stop;
@@ -2324,10 +2324,10 @@ module OneM2M_Testcases_AE {
 							setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
 
 							//set responseStatusCode back to SUT
-							v_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimtive));
+							mcaPort.send(m_response(v_responsePrimitive));
 						}
 						[] mcaPort.receive {
 							tc_ac.stop;
@@ -2370,7 +2370,7 @@ module OneM2M_Testcases_AE {
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
 					var MsgIn v_request;
-					var ResponsePrimitive v_responsePrimtive;
+					var ResponsePrimitive v_responsePrimitive;
 					var charstring v_action := "Please, send a valid AE Registration CREATE Request";
   	
 					var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
@@ -2385,10 +2385,10 @@ module OneM2M_Testcases_AE {
 						[] mcaPort.receive(mw_request(mw_createAe)) -> value v_request {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
-							v_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 			
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimtive));
+							mcaPort.send(m_response(v_responsePrimitive));
 						} 
 						[] mcaPort.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {
 							tc_ac.stop;
@@ -2415,10 +2415,10 @@ module OneM2M_Testcases_AE {
 							setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
 
 							//set responseStatusCode back to SUT
-							v_responsePrimtive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
 
 							//send back responsePrimitive
-							mcaPort.send(m_response(v_responsePrimtive));
+							mcaPort.send(m_response(v_responsePrimitive));
 						}
 						[] mcaPort.receive {
 							tc_ac.stop;
-- 
GitLab