From bd8e4fa1d37ccc3bdcc813b0f189b27ea7f9e4be Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Thu, 23 Jan 2020 15:12:17 +0100
Subject: [PATCH] Fix #88
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
LibOneM2M/OneM2M_Functions.ttcn | 16 ++++++++++++++++
LibOneM2M/OneM2M_Templates.ttcn | 18 ++++++++++++++++++
OneM2M_PermutationFunctions.ttcn | 12 ++++++++----
3 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 3880922..cf2cbc8 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -4545,6 +4545,22 @@ module OneM2M_Functions {
v_primitiveContent.timeSeries.contentInfo := ?;
}
}
+ else if(ischosen(p_primitiveContent.timeSeriesInstance)){ // timeSeriesInstance
+ v_primitiveContent := {timeSeriesInstance := mw_contentTimeSeriesInstanceBase};
+
+ if(ispresent(p_primitiveContent.timeSeriesInstance.labels)){
+ v_primitiveContent.timeSeriesInstance.labels := ?;
+ }
+ if(ispresent(p_primitiveContent.timeSeriesInstance.announceTo)){
+ v_primitiveContent.timeSeriesInstance.announceTo := ?;
+ }
+ if(ispresent(p_primitiveContent.timeSeriesInstance.announcedAttribute)){
+ v_primitiveContent.timeSeriesInstance.announcedAttribute := ?;
+ }
+ if(ispresent(p_primitiveContent.timeSeriesInstance.sequenceNr)){
+ v_primitiveContent.timeSeriesInstance.sequenceNr := ?;
+ }
+ }
return v_primitiveContent;
}
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 876ec06..a98b9fe 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -6827,6 +6827,24 @@ module OneM2M_Templates {
choice := {choice_list := ?} //O
}
+ template TimeSeriesInstance_optional mw_contentTimeSeriesInstanceBase := {
+ resourceName := ?,//M
+ resourceType := ?,//M
+ resourceID := ?,//M
+ parentID := ?,//M
+ creationTime := ?,//M
+ lastModifiedTime := ?,//M
+ labels := *,//O
+ expirationTime := ?,//M
+ announceTo := *,//O
+ announcedAttribute := *,//O
+ dataGenerationTime := ?,//M
+ content := ?,//M
+ sequenceNr := *,//O
+ contentSize := ?,//M
+ choice := *//O
+ };
+
template (value) Role_optional mw_contentRole_allOmit := {
resourceName := omit,//O
resourceType := omit,//NP
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 67b93ef..2b4a2c1 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -3376,7 +3376,7 @@ module OneM2M_PermutationFunctions {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
- var integer v_containerIndex := -1;
+ var integer v_aeIndex := -1;
var integer v_parentIndex := -1;
var integer v_acpAuxIndex := -1;
var integer v_ae2Index := -1;
@@ -3402,15 +3402,19 @@ module OneM2M_PermutationFunctions {
v_acpAuxIndex := f_cse_preamble_createAcpAux();//c_CRUDNDi)
}
- v_parentIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+ v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
if(p_resourceType == int4) {
- v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_parentIndex);
- v_parentIndex := v_containerIndex;
+ v_parentIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
+ }
+
+ if(p_resourceType == int30) {
+ v_parentIndex := f_cse_createResource(int29, m_createTimeSeriesBase, v_aeIndex);
}
+
// Test Body
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex);
--
GitLab