From 375578983219fe11c02684bee404052488a46e13 Mon Sep 17 00:00:00 2001 From: reinaortega <miguelangel.reinaortega@etsi.org> Date: Thu, 18 May 2017 07:38:02 +0200 Subject: [PATCH] Small correction for f_cse_postamble_deleteResources Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org> --- LibOneM2M/OneM2M_Functions.ttcn | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn index 6888d71..b7cf763 100644 --- a/LibOneM2M/OneM2M_Functions.ttcn +++ b/LibOneM2M/OneM2M_Functions.ttcn @@ -7,7 +7,7 @@ * * @author oneM2M * @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Functions.ttcn $ - * $Id: OneM2M_Functions.ttcn 277 2017-05-18 04:51:46Z reinaortega $ + * $Id: OneM2M_Functions.ttcn 278 2017-05-18 05:37:19Z reinaortega $ * @desc Module containing functions for oneM2M * */ @@ -324,12 +324,13 @@ module OneM2M_Functions { v_request := valueof(m_deleteRequest(v_resourceAddress)); - //Not needed any longer: PX_SUPER_USER should be able to do all operations -// if(PX_FROM_IS_AE_ID){ -// if(ischosen(vc_resourcesList[vc_resourcesIndexToBeDeleted[i]].resource.any_1[0].AE_optional)) { -// v_request.from_ := vc_resourcesList[vc_resourcesIndexToBeDeleted[i]].resource.any_1[0].AE_optional.aE_ID; -// } -// } + //For deletion of AEs, priority is to use AE-ID in From parameter + //For other resources PX_SUPER_USER should be able to do DELETE operation + if(PX_FROM_IS_AE_ID){ + if(ischosen(vc_resourcesList[vc_resourcesIndexToBeDeleted[i]].resource.any_1[0].AE_optional)) { + v_request.from_ := vc_resourcesList[vc_resourcesIndexToBeDeleted[i]].resource.any_1[0].AE_optional.aE_ID; + } + } mcaPort.send(m_request(v_request)); -- GitLab