From 88e26d8103c9671f480b694156d03b0c66403e30 Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Wed, 22 Jan 2020 16:12:03 +0100
Subject: [PATCH] Fix #85
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
LibOneM2M/OneM2M_Functions.ttcn | 8 +++++++-
OneM2M_Testcases_CSE_Release_3.ttcn | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index b4ece32..518a2eb 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -4816,7 +4816,13 @@ module OneM2M_Functions {
}
if(ischosen(p_contentResource.genericInterworkingService_invalid)) {
return p_contentResource.genericInterworkingService_invalid.resourceName;
- }
+ }
+ if(ischosen(p_contentResource.timeSeries)) {
+ return p_contentResource.timeSeries.resourceName;
+ }
+ if(ischosen(p_contentResource.timeSeriesInstance)) {
+ return p_contentResource.timeSeriesInstance.resourceName;
+ }
log(__SCOPE__&":WARNING: Primitive Content Kind not implemented");
return "resourceNameNotFound";
diff --git a/OneM2M_Testcases_CSE_Release_3.ttcn b/OneM2M_Testcases_CSE_Release_3.ttcn
index caa64ef..09e3854 100644
--- a/OneM2M_Testcases_CSE_Release_3.ttcn
+++ b/OneM2M_Testcases_CSE_Release_3.ttcn
@@ -881,7 +881,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_createRequestTimeSeries.primitiveContent.container.maxByteSize := c_maxByteSize;
+ v_createRequestTimeSeries.primitiveContent.timeSeries.maxByteSize := c_maxByteSize;
v_createRequestTimeSeriesInstance1.primitiveContent.timeSeriesInstance.content := c_primitiveContent1; //ContentInstance 1
v_createRequestTimeSeriesInstance2.primitiveContent.timeSeriesInstance.content := c_primitiveContent2; //ContentInstance 2
v_createRequestTimeSeriesInstance2.primitiveContent.timeSeriesInstance.resourceName := c_defaultTimeSeriesInstanceResourceName & "2"; //ContentInstance 2
--
GitLab