From 117c85c99cfbaefffdfa5cb124d8d76c3b6185c0 Mon Sep 17 00:00:00 2001 From: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org> Date: Fri, 2 Dec 2016 06:08:04 +0100 Subject: [PATCH] ServiceSubscribedAppRule_optional added to f_getResourceName and f_getResourceId functions Signed-off-by: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org> --- LibOneM2M/OneM2M_Functions.ttcn | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn index 1d92cd9..a6d6b93 100644 --- a/LibOneM2M/OneM2M_Functions.ttcn +++ b/LibOneM2M/OneM2M_Functions.ttcn @@ -7,7 +7,7 @@ * * @author ETSI * @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Functions.ttcn $ - * $Id: OneM2M_Functions.ttcn 189 2016-11-29 07:22:10Z reinaortega $ + * $Id: OneM2M_Functions.ttcn 190 2016-11-30 01:33:55Z reinaortega $ * @desc Module containing functions for oneM2M * */ @@ -858,6 +858,9 @@ module OneM2M_Functions { if(ischosen(p_contentResource.any_1[0].AE_optional)) { return p_contentResource.any_1[0].AE_optional.resourceID; } + if(ischosen(p_contentResource.any_1[0].ServiceSubscribedAppRule_optional)) { + return p_contentResource.any_1[0].ServiceSubscribedAppRule_optional.resourceID; + } return "1"; } @@ -891,6 +894,9 @@ module OneM2M_Functions { if(ischosen(p_contentResource.any_1[0].AE_optional)) { return p_contentResource.any_1[0].AE_optional.resourceName; } + if(ischosen(p_contentResource.any_1[0].ServiceSubscribedAppRule_optional)) { + return p_contentResource.any_1[0].ServiceSubscribedAppRule_optional.resourceName; + } return "1"; -- GitLab