Initialization of vc_aeAuxIndex and removal of spare v_aeAuxIndex local variables

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

LibOneM2M/OneM2M_Functions.ttcn

@@ -508,7 +508,6 @@ module OneM2M_Functions {
 			
 				var RequestPrimitive v_request;
 				var MsgIn v_response;
-				var integer v_aeAuxIndex := -1;
 								
 				v_request := valueof(m_createAeAux(p_accessControlPolicyIDs, p_poaList));
 				
@@ -564,17 +563,14 @@ module OneM2M_Functions {
 			function f_cse_preamble_registerAeWithId(XSD.ID p_appId, in template (value) AccessControlOperations p_allowedOperations := int63) runs on AeSimu return integer {//c_CRUDNDi
 			
 				var RequestPrimitive v_request;
-				var integer v_aeAuxIndex := -1;
-				var integer v_acpAuxIndex := -1;
-			
+				
 				if(PICS_ACP_SUPPORT){
-					v_acpAuxIndex := f_cse_createAccessControlPolicyAux(p_allowedOperations := p_allowedOperations);
-					vc_acpAuxIndex := v_acpAuxIndex;
+					vc_acpAuxIndex := f_cse_createAccessControlPolicyAux(p_allowedOperations := p_allowedOperations);
 				}
 				
-				if(v_acpAuxIndex != -1) {
-					vc_resourcesIndexToBeDeleted := {v_acpAuxIndex};
-					v_request := valueof(m_createAe(p_appId, {f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -));
+				if(vc_acpAuxIndex != -1) {
+					vc_resourcesIndexToBeDeleted := {vc_acpAuxIndex};
+					v_request := valueof(m_createAe(p_appId, {f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)}, -));
 					
 					//TODO Test, to be removed
 					v_request.to_ := f_getResourceAddress();

LibOneM2M/OneM2M_TestSystem.ttcn

@@ -34,8 +34,8 @@ module OneM2M_TestSystem {
 		var TestSystemRole vc_testSystemRole;
 		var MyResourcesList vc_resourcesList;
 		var IntegerList vc_resourcesIndexToBeDeleted := {};
-		var integer vc_aeAuxIndex;//TODO To be removed
-		var integer vc_acpAuxIndex;
+		var integer vc_aeAuxIndex := -1;//TODO To be removed
+		var integer vc_acpAuxIndex := -1;
 		var AccessControlPolicy_optional vc_acpAux;
 		var MsgIn vc_request;
 		var MsgIn vc_response;