From dd8c70f1336e253b62b4a426759ed0b49ecbe6d6 Mon Sep 17 00:00:00 2001
From: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
Date: Thu, 7 Dec 2017 06:24:07 +0100
Subject: [PATCH] f_getResourceName and f_getResourceId updated with
m2mServiceSubscriptionProfile, node, statsConfig and statsCollect
Signed-off-by: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
---
LibOneM2M/OneM2M_Functions.ttcn | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 7e9a793..61cb4c0 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -2343,6 +2343,18 @@ module OneM2M_Functions {
if(ischosen(p_contentResource.cSEBase)) {
return f_resourceIdCleaner(p_contentResource.cSEBase.resourceID);
}
+ if(ischosen(p_contentResource.m2mServiceSubscriptionProfile)) {
+ return p_contentResource.m2mServiceSubscriptionProfile.resourceName;
+ }
+ if(ischosen(p_contentResource.node)) {
+ return p_contentResource.node.resourceName;
+ }
+ if(ischosen(p_contentResource.statsConfig)) {
+ return p_contentResource.statsConfig.resourceName;
+ }
+ if(ischosen(p_contentResource.statsCollect)) {
+ return p_contentResource.statsCollect.resourceName;
+ }
log(__SCOPE__&":WARNING: Primitive Content Kind not implemented");
@@ -2391,6 +2403,19 @@ module OneM2M_Functions {
if(ischosen(p_contentResource.cSEBase)) {
return p_contentResource.cSEBase.resourceName;
}
+ if(ischosen(p_contentResource.m2mServiceSubscriptionProfile)) {
+ return p_contentResource.m2mServiceSubscriptionProfile.resourceName;
+ }
+ if(ischosen(p_contentResource.node)) {
+ return p_contentResource.node.resourceName;
+ }
+ if(ischosen(p_contentResource.statsConfig)) {
+ return p_contentResource.statsConfig.resourceName;
+ }
+ if(ischosen(p_contentResource.statsCollect)) {
+ return p_contentResource.statsCollect.resourceName;
+ }
+
log(__SCOPE__&":WARNING: Primitive Content Kind not implemented");
return "resourceNameNotFound";
--
GitLab