Fix of TC_CSE_DMR_UPD_015 to set acpi on resources properly

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

OneM2M_PermutationFunctions.ttcn

@@ -5869,24 +5869,30 @@ module OneM2M_PermutationFunctions {
 						// Test adapter configuration
 
 						// Preamble
-						if(p_resourceType != int2) {
-							v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-						}
-
 						if(p_resourceType != int1) {
-							
 							f_cse_createAccessControlPolicyAux(-, -, -);
-						
 							p_createRequestPrimitive := f_setAcpId(p_createRequestPrimitive, {vc_resourcesList[vc_acpIndex].resource.accessControlPolicy.resourceID});
 						}
 						
+						if((p_resourceType != int2) and (p_resourceType != int1)) {
+							v_aeIndex := f_cse_preamble_registerAe({vc_resourcesList[vc_acpIndex].resource.accessControlPolicy.resourceID});//c_CRUDNDi);
+						}
+
+						
 						if(p_secondAcp) {//A second ACP is required
 							v_acpIndex := f_cse_createResource(int1, m_createAcpBase);
 							
 							v_acpi := {vc_resourcesList[v_acpIndex].resource.accessControlPolicy.resourceID};
 							
-							p_updateRequestPrimitive := f_setAcpId(p_updateRequestPrimitive, v_acpi);
-							
+							if(p_resourceType == int9){
+								if(ispresent(p_updateRequestPrimitive.primitiveContent.group_.membersAccessControlPolicyIDs)) {
+									p_updateRequestPrimitive.primitiveContent.group_.membersAccessControlPolicyIDs := v_acpi;
+								} else {
+									p_updateRequestPrimitive := f_setAcpId(p_updateRequestPrimitive, v_acpi);
+								}
+							} else {
+								p_updateRequestPrimitive := f_setAcpId(p_updateRequestPrimitive, v_acpi);
+							}							
 						}
   
 						if (p_resourceType!=int16){	//ResourceType != RemoteCSE

OneM2M_Testcases_CSE_Release_1.ttcn

@@ -7338,7 +7338,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						var ResponsePrimitive v_responsePrimitive;
 						var PrimitiveContent v_primitiveContentRetrieveResource;
 						v_updateRequest.primitiveContent.group_.membersAccessControlPolicyIDs := v_membersAccessControlPolicyIDs;
-						v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createGroupBase, v_updateRequest));//Group
+						v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createGroupBase, v_updateRequest, true));//Group
 						v_ae1.done;