TC_CSE_SEC_ACP_BO_012_04 updated

Signed-off-by: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>

OneM2M_Testcases.ttcn

@@ -7,7 +7,7 @@
  *  
  *  @author     ETSI
  *  @version    $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Testcases.ttcn $
- *              $Id: OneM2M_Testcases.ttcn 186 2016-11-29 03:00:14Z reinaortega $
+ *              $Id: OneM2M_Testcases.ttcn 196 2016-12-02 00:21:48Z reinaortega $
  *  @desc       Module containing test cases for oneM2M
  *
  */
@@ -9521,33 +9521,35 @@ module OneM2M_Testcases {
 				group g_CSE_SEC_ACP_BO_012 {
 					
 					testcase TC_CSE_SEC_ACP_BO_012_01() runs on CseTester system CseSystem { //Create
-						f_CSE_SEC_ACP_BO_012(m_createContainerBase);	
+						f_CSE_SEC_ACP_BO_012(m_createContainerBase, int62);	
 					}//end TC_CSE_SEC_ACP_BO_012_01
 
 					testcase TC_CSE_SEC_ACP_BO_012_02() runs on CseTester system CseSystem { //Update
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var Labels v_labels_1:= {"VALUE_1"};
 						v_updateRequest.primitiveContent.any_1[0].Container_optional.labels := v_labels_1;
-						f_CSE_SEC_ACP_BO_012(v_updateRequest);	
+						f_CSE_SEC_ACP_BO_012(v_updateRequest, int62);	//TODO Fix p_acor
 					}//end TC_CSE_SEC_ACP_BO_012_02
 
 					testcase TC_CSE_SEC_ACP_BO_012_03() runs on CseTester system CseSystem { //Retrieve
-						f_CSE_SEC_ACP_BO_012(m_retrieveResource("Temporary", "Temporary"));	
+						f_CSE_SEC_ACP_BO_012(m_retrieveResource("Temporary", "Temporary"), int62);	//TODO Fix p_acor
 					}//end TC_CSE_SEC_ACP_BO_012_03
 
 					testcase TC_CSE_SEC_ACP_BO_012_04() runs on CseTester system CseSystem { //Delete
-						f_CSE_SEC_ACP_BO_012(m_deleteRequest("Temporary"));	
+						f_CSE_SEC_ACP_BO_012(m_deleteRequest("Temporary"), int62);	//TODO Fix p_acor
 					}//end TC_CSE_SEC_ACP_BO_012_04
 
-					function f_CSE_SEC_ACP_BO_012(template RequestPrimitive p_requestPrimitive) runs on CseTester {
+					function f_CSE_SEC_ACP_BO_012(template RequestPrimitive p_requestPrimitive, in AccessControlOperations p_acor) runs on CseTester {
 						// Local variables
 						var MsgIn v_response;
 						var integer v_aeIndex := -1;
 						var integer v_containerIndex := -1;
+						var integer v_resourceIndex := -1;
 						var integer v_acpIndex := -1;
+						var RequestPrimitive v_request; 
 						var RequestPrimitive v_createRequest := valueof(m_createAcpBase);
 						var RequestPrimitive v_updateRequest;
-						var AccessControlRule v_accessControlRule_1;
+						var AccessControlRule v_accessControlRule_1, v_accessControlRule_2;
 						var SetOfAcrs v_setOfArcs;
 
 						// Test control
@@ -9562,17 +9564,17 @@ module OneM2M_Testcases {
 						v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpIndex].resource)}, -);
 						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
 						
-						v_accessControlRule_1 := valueof(m_createAcr({PX_SUPER_USER, f_getOriginator(v_aeIndex)}, int63));
-						v_setOfArcs.accessControlRule_list := {v_accessControlRule_1};
-						v_updateRequest := valueof(m_updateAcpPrivileges(v_setOfArcs, v_setOfArcs));
+						v_accessControlRule_1 := valueof(m_createAcr({PX_SUPER_USER}, int63));
+						v_accessControlRule_2 := valueof(m_createAcr({f_getOriginator(v_aeIndex)}, p_acor));
+						v_setOfArcs.accessControlRule_list := {v_accessControlRule_1, v_accessControlRule_2};
+						v_updateRequest := valueof(m_updateAcpPrivileges(v_setOfArcs, -));
 						v_updateRequest := f_getUpdateRequestPrimitive(int1, v_acpIndex, v_updateRequest);
 						f_cse_updateResource(v_updateRequest);
 						
 						// Test Body
-						p_requestPrimitive.to_ := f_getResourceAddress(v_containerIndex);
-						p_requestPrimitive.from_ := "UnknowOriginator";
-
-						mcaPort.send(m_request(valueof(p_requestPrimitive)));
+						v_request := f_getCreateRequestPrimitive(int3, p_requestPrimitive, v_containerIndex);
+						
+						mcaPort.send(m_request(valueof(v_request)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {