From c49e3f36adfa540d19e92db0ba1cd57c2892083e Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Wed, 27 Oct 2021 11:27:55 +0200
Subject: [PATCH] Remove function calls from template definitions
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
LibOneM2M/OneM2M_Functions.ttcn | 22 +++++++++++
LibOneM2M/OneM2M_Templates.ttcn | 68 +++++++++++++--------------------
2 files changed, 49 insertions(+), 41 deletions(-)
diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index c4cc04f..cfa95dd 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -4320,6 +4320,13 @@ module OneM2M_Functions {
}
}
} else if (p_resourceType == int4) {//contentInstance
+ } else if (p_resourceType == int30) {//timeSeriesInstance
+ //dataGenerationTime
+ if(ispresent(p_request.primitiveContent.timeSeriesInstance.dataGenerationTime)) {
+ if(match(valueof(p_request.primitiveContent.timeSeriesInstance.dataGenerationTime), {alt_ := "29991231T000000"} )){
+ p_request.primitiveContent.timeSeriesInstance.dataGenerationTime := {alt_ := fx_generateTimestamp()};
+ }
+ }
}
return valueof(p_request);
@@ -5961,9 +5968,24 @@ module OneM2M_Functions {
p_msgOut.protocolBinding := vc_myInterfaces[enum2int(p_interfaceIds)].myProtocolBinding;
p_msgOut.serialization := vc_myInterfaces[enum2int(p_interfaceIds)].mySerialization;
log("f_send: protocolBinding=", p_msgOut.protocolBinding);
+ if(ischosen(p_msgOut.primitive.requestPrimitive)){
+ p_msgOut.primitive.requestPrimitive.requestIdentifier := p_msgOut.primitive.requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
+ }
vc_myInterfaces[enum2int(p_interfaceIds)].myPort.send(p_msgOut);
}
+ /**
+ * @desc Get a converted to string random number
+ * @param p_lower Lower limit
+ * @param p_upper Upper limit
+ * @return Random number converted to string
+ * @verdict
+ */
+ function f_rnd(in integer p_lower, in integer p_upper) return charstring {
+
+ return int2str(float2int(rnd() * int2float(p_upper - p_lower + 1)) + p_lower);
+ }
+
}//end of commonFunctions
group externalFunctions {
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 872192c..5c6a57d 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -15,21 +15,7 @@ module OneM2M_Templates {
import from OneM2M_Types all;
import from OneM2M_TypesAndValues all;
import from OneM2M_Pixits all;
- import from OneM2M_Functions all;
-
- /**
- * @desc Get a converted to string random number
- * @param p_lower Lower limit
- * @param p_upper Upper limit
- * @return Random number converted to string
- * @verdict
- */
- function f_rnd(in integer p_lower, in integer p_upper) return charstring {
-
- return int2str(float2int(rnd() * int2float(p_upper - p_lower + 1)) + p_lower);
- }
-
-
+
/* Templates */
group Primitives {
@@ -101,7 +87,7 @@ module OneM2M_Templates {
operation := int2,
to_ := p_targetResourceAddress,
from_ := p_originator,
- requestIdentifier := "m_retrieve" & f_rnd(1, 1000000),
+ requestIdentifier := "m_retrieve",
resourceType := omit,
primitiveContent := omit,
roleIDs := omit,
@@ -198,7 +184,7 @@ module OneM2M_Templates {
operation := int2,
to_ := p_targetResourceAddress,
from_ := p_originator,
- requestIdentifier := "m_retrieveResourceAttributeOptionTo" & f_rnd(1, 1000000),
+ requestIdentifier := "m_retrieveResourceAttributeOptionTo",
resourceType := omit,
primitiveContent := omit,
roleIDs := omit,
@@ -232,7 +218,7 @@ module OneM2M_Templates {
operation := int2,
to_ := p_targetResourceAddress,
from_ := p_originator,
- requestIdentifier := "m_retrieveResourceAttributeContentOption" & f_rnd(1, 1000000),
+ requestIdentifier := "m_retrieveResourceAttributeContentOption",
resourceType := omit,
primitiveContent := {attributeList := p_attributeList},
roleIDs := omit,
@@ -263,7 +249,7 @@ module OneM2M_Templates {
* @param p_originator Originator (from)
*/
template (value) RequestPrimitive m_retrieveFilterUsageOption(XSD.ID p_targetResourceAddress, in XSD.ID p_originator, in template (value) FilterUsage p_filterUsage) modifies m_retrieve := {
- requestIdentifier := "m_retrieveResourceFilterUsageOption" & f_rnd(1, 1000000),
+ requestIdentifier := "m_retrieveResourceFilterUsageOption",
filterCriteria := {
createdBefore := omit,
createdAfter := omit,
@@ -297,7 +283,7 @@ module OneM2M_Templates {
* @param p_originator Originator (from)
*/
template (value) RequestPrimitive m_retrieveFilterCriteria(XSD.ID p_targetResourceAddress, in XSD.ID p_originator, in template (value) FilterCriteria p_filterCriteria) modifies m_retrieve := {
- requestIdentifier := "m_retrieveResourceFilterUsageOption" & f_rnd(1, 1000000),
+ requestIdentifier := "m_retrieveResourceFilterUsageOption",
filterCriteria := p_filterCriteria
};
@@ -309,7 +295,7 @@ module OneM2M_Templates {
* @param p_labels Labels
*/
template (value) RequestPrimitive m_retrieveFilterUsageOptionLabel(XSD.ID p_targetResourceAddress, in XSD.ID p_originator, in template (value) FilterUsage p_filterUsage, in Labels p_labels) modifies m_retrieve := {
- requestIdentifier := "m_retrieveResourceFilterUsageOptionLabel" & f_rnd(1, 1000000),
+ requestIdentifier := "m_retrieveResourceFilterUsageOptionLabel",
filterCriteria := {
createdBefore := omit,
createdAfter := omit,
@@ -342,7 +328,7 @@ module OneM2M_Templates {
* @param p_originator Originator (from)
*/
template (value) RequestPrimitive m_retrieveDiscResTypeFilterUsageOption(XSD.ID p_targetResourceAddress, in XSD.ID p_originator, in template (value) DesIdResType p_desIdResType, in template (value) FilterUsage p_filterUsage) modifies m_retrieve := {
- requestIdentifier := "m_retrieveResourceFilterUsageOption" & f_rnd(1, 1000000),
+ requestIdentifier := "m_retrieveResourceFilterUsageOption",
filterCriteria := {
createdBefore := omit,
createdAfter := omit,
@@ -377,7 +363,7 @@ module OneM2M_Templates {
* @param p_originator Originator (from)
*/
template (value) RequestPrimitive m_retrieveInvalidFormatOption(XSD.ID p_targetResourceAddress, in XSD.ID p_originator) modifies m_retrieve := {
- requestIdentifier := "m_retrieveResourceFilterUsageOption" & f_rnd(1, 1000000),
+ requestIdentifier := "m_retrieveResourceFilterUsageOption",
filterCriteria := {
createdBefore := omit,
createdAfter := omit,
@@ -1397,7 +1383,7 @@ module OneM2M_Templates {
operation := int4,
to_ := p_resourceAddress,
from_ := p_originator,
- requestIdentifier := testcasename() & "-m_delete" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_delete",
resourceType := omit,
primitiveContent := omit,
roleIDs := omit,
@@ -1468,7 +1454,7 @@ module OneM2M_Templates {
operation := int5,
to_ := p_resourceAddress,
from_ := "NotInitialized",
- requestIdentifier := testcasename() & "-m_notify" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_notify",
resourceType := omit,
primitiveContent := {notification := m_contentNotification_allOmit},
roleIDs := omit,
@@ -1515,7 +1501,7 @@ module OneM2M_Templates {
operation := int5,
to_ := "NotInitialized",
from_ := omit,
- requestIdentifier := testcasename() & "-m_notifyAggregatedNotification" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_notifyAggregatedNotification",
resourceType := omit,
primitiveContent := {aggregatedNotification := {notification_list := {m_contentNotification_allOmit,m_contentNotification_allOmit}}},
roleIDs := omit,
@@ -3247,7 +3233,7 @@ module OneM2M_Templates {
expirationTime := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
- dataGenerationTime := {alt_ := fx_generateTimestamp()},//M
+ dataGenerationTime := {alt_ := "29991231T000000"},//M
content := "AnyValue",//M
sequenceNr := omit,//O
contentSize := omit//NP
@@ -5433,7 +5419,7 @@ module OneM2M_Templates {
template (value) ResponsePrimitive m_responseNotification(ResponseStatusCode p_statusCode, in template(omit) PrimitiveContent p_notification := omit) := {
responseStatusCode := p_statusCode,
- requestIdentifier := testcasename() & "-m_responseNotification" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_responseNotification",
primitiveContent := p_notification,
to_ := omit,
from_ := omit,
@@ -5481,7 +5467,7 @@ module OneM2M_Templates {
operation := int1,
to_ := "NotInitialized",
from_ := "UNINITIALIZED",
- requestIdentifier := testcasename() & "-m_utCreate" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_utCreate",
resourceType := omit,
primitiveContent := omit,
roleIDs := omit,
@@ -5509,7 +5495,7 @@ module OneM2M_Templates {
template (value) UtTriggerPrimitive m_utCreateAe modifies m_utCreate := {
requestPrimitive := {
- requestIdentifier := testcasename() & "-m_utCreateAe" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_utCreateAe",
resourceType := int2,
primitiveContent := {aE := m_contentAe_allOmit}
}
@@ -5517,7 +5503,7 @@ module OneM2M_Templates {
template (value) UtTriggerPrimitive m_utCreateContainer modifies m_utCreate := {
requestPrimitive := {
- requestIdentifier := testcasename() & "-m_utCreateContainer" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_utCreateContainer",
resourceType := int3,
primitiveContent := {container := valueof(mw_contentContainer_allOmit)}
}
@@ -5525,7 +5511,7 @@ module OneM2M_Templates {
template (value) UtTriggerPrimitive m_utCreateContentInstance modifies m_utCreate := {
requestPrimitive := {
- requestIdentifier := testcasename() & "-m_utCreateContentInstance" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_utCreateContentInstance",
resourceType := int4,
primitiveContent := {contentInstance := m_contentContentInstance_allOmit}
}
@@ -5533,7 +5519,7 @@ module OneM2M_Templates {
template (value) UtTriggerPrimitive m_utCreateSubscription modifies m_utCreate := {
requestPrimitive := {
- requestIdentifier := testcasename() & "-m_utCreateSubscription" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_utCreateSubscription",
resourceType := int23,
primitiveContent := {subscription := m_contentSubscription}
}
@@ -5541,7 +5527,7 @@ module OneM2M_Templates {
template (value) UtTriggerPrimitive m_utCreateRemoteCSE modifies m_utCreate := {
requestPrimitive := {
- requestIdentifier := testcasename() & "-m_utCreateRemoteCSE" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_utCreateRemoteCSE",
resourceType := int16,
primitiveContent := {remoteCSE := m_contentRemoteCSE_allOmit}
}
@@ -5549,7 +5535,7 @@ module OneM2M_Templates {
template (value) UtTriggerPrimitive m_utCreatePollingChannel modifies m_utCreate := {
requestPrimitive := {
- requestIdentifier := testcasename() & "-m_utCreatePollingChannel" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_utCreatePollingChannel",
resourceType := int15,
primitiveContent := {pollingChannel := m_contentPollingChannel_allOmit}
}
@@ -5560,7 +5546,7 @@ module OneM2M_Templates {
operation := int2,
to_ := p_targetResourceAddress,
from_ := "UNINITIALIZED",
- requestIdentifier := "m_utRetrieveResource" & f_rnd(1, 1000000),
+ requestIdentifier := "m_utRetrieveResource",
resourceType := omit,
primitiveContent := omit,
roleIDs := omit,
@@ -5588,7 +5574,7 @@ module OneM2M_Templates {
template (value) UtTriggerPrimitive m_utRetrievePollingChannelUri(XSD.ID p_targetResourceAddress) modifies m_utRetrieve := {
requestPrimitive := {
- requestIdentifier := testcasename() & "-m_utRetrievePollingChannelUri" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_utRetrievePollingChannelUri",
resourceType := int15,
primitiveContent := {pollingChannel := m_contentRetrievePollingChannel}
}
@@ -5599,7 +5585,7 @@ module OneM2M_Templates {
operation := int3,
to_ := "NotInitialized",
from_ := "UNINITIALIZED",
- requestIdentifier := testcasename() & "-m_utUpdate" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_utUpdate",
resourceType := omit,
primitiveContent := omit,
roleIDs := omit,
@@ -5627,7 +5613,7 @@ module OneM2M_Templates {
template (value) UtTriggerPrimitive m_utUpdateAe modifies m_utUpdate := {
requestPrimitive := {
- requestIdentifier := testcasename() & "-m_utUpdateContainer" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_utUpdateContainer",
resourceType := int2,
primitiveContent := {aE := m_contentUpdateAe}
}
@@ -5635,7 +5621,7 @@ module OneM2M_Templates {
template (value) UtTriggerPrimitive m_utUpdateContainer modifies m_utUpdate := {
requestPrimitive := {
- requestIdentifier := testcasename() & "-m_utUpdateContainer" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_utUpdateContainer",
resourceType := int3,
primitiveContent := {container := m_contentUpdateContainer}
}
@@ -5646,7 +5632,7 @@ module OneM2M_Templates {
operation := int4,
to_ := "NotInitialized",
from_ := "UNINITIALIZED",
- requestIdentifier := testcasename() & "-m_utDeleteRequest" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_utDeleteRequest",
resourceType := omit,
primitiveContent := omit,
roleIDs := omit,
--
GitLab