From 73b60967f9fec0f2ef4a607707bda319989c2295 Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Mon, 27 Jan 2020 16:01:19 +0100
Subject: [PATCH] Fix #95
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
LibOneM2M/OneM2M_Functions.ttcn | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index a9827cf..a37d0c8 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -3513,11 +3513,30 @@ module OneM2M_Functions {
v_myResource.timeSeries.resourceType := p_resourceType;
v_myResource.timeSeries.parentID := f_getResourceId(vc_localResourcesList[p_parentIndex].resource);
v_myResource.timeSeries.creationTime := fx_generateTimestamp();
- v_myResource.timeSeries.lastModifiedTime := v_myResource.pollingChannel.creationTime;
+ v_myResource.timeSeries.lastModifiedTime := v_myResource.timeSeries.creationTime;
if(not(ispresent(p_resource.timeSeries.expirationTime))) {
v_myResource.timeSeries.expirationTime := "20301231T012345";
}
}
+ } else if(p_resourceType == int30 and ispresent(p_resource)) { //TimeSeriesInstance
+ if(ischosen(p_resource.timeSeriesInstance)){
+ v_myResource.timeSeriesInstance := valueof(p_resource.timeSeriesInstance);
+ v_myResource.timeSeriesInstance.resourceID := "ts" & int2str(v_resourceIndex);
+ if(not(ispresent(p_resource.timeSeriesInstance.resourceName))) {
+ v_myResource.timeSeriesInstance.resourceName := "timeSeriesInstance" & int2str(v_resourceIndex);
+ }
+ v_myResource.timeSeriesInstance.resourceType := p_resourceType;
+ v_myResource.timeSeriesInstance.parentID := f_getResourceId(vc_localResourcesList[p_parentIndex].resource);
+ v_myResource.timeSeriesInstance.creationTime := fx_generateTimestamp();
+ v_myResource.timeSeriesInstance.lastModifiedTime := v_myResource.timeSeriesInstance.creationTime;
+ if(not(ispresent(p_resource.timeSeriesInstance.expirationTime))) {
+ v_myResource.timeSeriesInstance.expirationTime := "20301231T012345";
+ }
+ v_myResource.timeSeriesInstance.contentSize := lengthof(v_myResource.timeSeriesInstance.content);
+ if(not(ispresent(p_resource.timeSeriesInstance.sequenceNr))) {
+ v_myResource.timeSeriesInstance.sequenceNr := 1;
+ }
+ }
}
return v_myResource;
--
GitLab