Review of f_CSE_ANNC_CRE_006_CseSimu

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

OneM2M_PermutationFunctions.ttcn

@@ -7438,29 +7438,14 @@ module OneM2M_PermutationFunctions {
 					//Preamble
 					v_ae1.start(f_cse_createResource(int2,v_create));
 					v_ae1.done;
+					
+					v_aeIndex := f_getLatestResourceIndex(v_ae1);
 
 					// Test Body
-					v_ae1.start(f_cse_sendCreateRequestPrimitive(p_resourceType,p_requestCreatePrimitive, v_parentIndex));
-
-					tc_ac.start;
-					alt {
-						[] mccPortIn.receive(mw_request(p_createRequestAnnc)) -> value v_request {
-							tc_ac.stop;
-							setverdict(pass, __SCOPE__ & ":INFO: CREATE REQUEST received");
+					v_ae1.start(f_cse_createResource(p_resourceType,p_requestCreatePrimitive, v_aeIndex));
 
-							if(match(v_request.primitive.requestPrimitive.to_, f_getLocalResourceAddress(v_aEAnncIndex, e_hierarchical, e_spRelative)) or 
-							match(v_request.primitive.requestPrimitive.to_, f_getLocalResourceAddress(v_aEAnncIndex, e_nonHierarchical, e_spRelative))) {
-								setverdict(pass, __SCOPE__ & ":matching ANNC_PARENT_RESOURCE_ADDRESS");     
-							} else {
-								setverdict(fail, __SCOPE__ & ":mis-matching ANNC_PARENT_RESOURCE_ADDRESS");
-							}
-		
-						}
-						[] tc_ac.timeout {
-							setverdict(fail, __SCOPE__ & ":ERROR:  No CREATE REQUEST received");
-						}
-					}
-					
+					f_cse_announcementProcedure_createHandler(p_createRequestAnnc, -, vc_localRemoteCseIndex);
+										
 					v_ae1.done;
 
 					// Postamble

OneM2M_Testcases_CSE_Release_2.ttcn

@@ -10586,7 +10586,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
   
 						 v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
-						v_cse1.done;
+						 v_cse1.done;
 						 v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_006_CseSimu(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy