TC_CSE_SEC_ACP_001 and TC_CSE_SEC_ACP_004 fixed - AE2 needs to register to be...

TC_CSE_SEC_ACP_001 and TC_CSE_SEC_ACP_004 fixed - AE2 needs to register to be known by the IUT (CSE)
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>

LibOneM2M/OneM2M_Functions.ttcn

@@ -1029,11 +1029,6 @@ module OneM2M_Functions {
 						setverdict(inconc, __SCOPE__&":INFO: Error while registering application");
 						stop;
 					}
-					[] mcaPort.receive {
-						tc_ac.stop;
-						setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
-						stop;
-					};
 					[] tc_ac.timeout {
 						setverdict(inconc, __SCOPE__&":INFO: No answer while registering resource");
 						stop;

OneM2M_PermutationFunctions.ttcn

@@ -7675,6 +7675,7 @@ module OneM2M_PermutationFunctions {
 							// Local variables
 							var MsgIn v_response;
 							var integer v_aeIndex := -1;
+							var integer v_aeIndex2 := -1;
 							var integer v_acpIndex := -1;
 							var RequestPrimitive v_createRequest := valueof(m_createAcpBase);
 							var RequestPrimitive v_updateRequest;
@@ -7684,7 +7685,7 @@ module OneM2M_PermutationFunctions {
 							// Test control
 	
 							// Test component configuration
-							f_cf01Up();
+							f_cf01Up(true);
 	
 							// Test adapter configuration
 	
@@ -7692,6 +7693,11 @@ module OneM2M_PermutationFunctions {
 							v_acpIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
 							v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpIndex].resource)}, -);
 							
+							vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_TS_AE2.appId, -, PX_TS_AE2.aeIdStem, c_defaultAe2ResourceName, -), -1)); // AE2 is registred
+							f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
+					
+							v_aeIndex2 := f_getLatestResource(vc_ae2);
+							
 							v_accessControlRule_1 := valueof(m_createAcr({ f_getOriginator(v_aeIndex), PX_SUPER_AE_ID}, int63));
 							v_setOfArcs.accessControlRule_list := {v_accessControlRule_1};
 							v_updateRequest := valueof(m_updateAcpPrivileges(v_setOfArcs, v_setOfArcs));
@@ -7699,7 +7705,7 @@ module OneM2M_PermutationFunctions {
 			
 							// Test Body
 							p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
-							p_requestPrimitive.from_ := "UnknowOriginator";
+							p_requestPrimitive.from_ := f_getResourceId(vc_resourcesList[v_aeIndex2].resource);
 							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
 	
 							f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
@@ -7881,13 +7887,14 @@ module OneM2M_PermutationFunctions {
 							// Local variables
 							var MsgIn v_response;
 							var integer v_aeIndex := -1;
+							var integer v_aeIndex2 := -1;
 							var integer v_acpIndex := -1;
 							var RequestPrimitive v_createRequest;
 			
 							// Test control
 	
 							// Test component configuration
-							f_cf01Up();
+							f_cf01Up(true);
 	
 							// Test adapter configuration
 	
@@ -7897,9 +7904,14 @@ module OneM2M_PermutationFunctions {
 							
 							v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpIndex].resource)}, -);
 			
+							vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_TS_AE2.appId, -, PX_TS_AE2.aeIdStem, c_defaultAe2ResourceName, -), -1)); // AE2 is registred
+							f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
+					
+							v_aeIndex2 := f_getLatestResource(vc_ae2);
+				
 							// Test Body
 							p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
-							p_requestPrimitive.from_ := "UnknowOriginator";
+							p_requestPrimitive.from_ := f_getResourceId(vc_resourcesList[v_aeIndex2].resource);
 							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
 			
 							f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));