From 6d422e93a6fa26338c00bd3932c6ea2b16ba753e Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Fri, 18 Mar 2022 16:39:11 +0100
Subject: [PATCH] Valueof missing and template element order fixed
---
LibOneM2M/OneM2M_Functions.ttcn | 6 ++--
LibOneM2M/OneM2M_Templates.ttcn | 52 ++++++++++++++---------------
OneM2M_PermutationFunctions.ttcn | 6 ++--
OneM2M_Testcases_CSE_Release_3.ttcn | 4 +--
4 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index a40d547..d5c4a52 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -4262,7 +4262,7 @@ module OneM2M_Functions {
vc_localResourcesList[p_localResourceIndex].resource.containerAnnc.maxInstanceAge := p_resource.containerAnnc.maxInstanceAge;
}
if(isvalue(p_nullFields)) {
- if (p_nullFields[0] == "maxByteSize") {
+ if (valueof(p_nullFields[0]) == "maxByteSize") {
vc_localResourcesList[p_localResourceIndex].resource.containerAnnc.maxByteSize := omit;
}
}
@@ -4286,7 +4286,7 @@ module OneM2M_Functions {
vc_localResourcesList[p_localResourceIndex].resource.timeSeriesAnnc.maxInstanceAge := p_resource.timeSeriesAnnc.maxInstanceAge;
}
if(isvalue(p_nullFields)) {
- if (p_nullFields[0] == "maxByteSize") {
+ if (valueof(p_nullFields[0]) == "maxByteSize") {
vc_localResourcesList[p_localResourceIndex].resource.timeSeriesAnnc.maxByteSize := omit;
}
}
@@ -4302,7 +4302,7 @@ module OneM2M_Functions {
vc_localResourcesList[p_localResourceIndex].resource.groupAnnc.dynamicAuthorizationConsultationIDs := p_resource.groupAnnc.dynamicAuthorizationConsultationIDs;
}
if(isvalue(p_nullFields)) {
- if (p_nullFields[0] == "maxNrOfMembers") {
+ if (valueof(p_nullFields[0]) == "maxNrOfMembers") {
vc_localResourcesList[p_localResourceIndex].resource.groupAnnc.maxNrOfMembers := omit;
}
}
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 9625cae..f9fbcf5 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -2734,9 +2734,9 @@ module OneM2M_Templates {
creationTime := omit,//NA M
lastModifiedTime := omit,//NA M
labels := p_labels,//MA O
- accessControlPolicyIDs := p_accessControlPolicyIds,//MA O
expirationTime := "29991231T235959",//MA M
link := p_link,//M
+ accessControlPolicyIDs := p_accessControlPolicyIds,//MA O
cseType := omit,//OA O
cSE_ID := omit,//OA M
supportedResourceType := omit,//OA M
@@ -2761,9 +2761,9 @@ module OneM2M_Templates {
creationTime := omit,//NA M
lastModifiedTime := omit,//NA M
labels := p_labels,//MA O
- accessControlPolicyIDs := p_accessControlPolicyIds,//MA O
expirationTime := ?,//MA M
link := p_link,//M
+ accessControlPolicyIDs := p_accessControlPolicyIds,//MA O
cseType := *,//OA O
cSE_ID := *,//OA M
supportedResourceType := ?,//OA M
@@ -3134,8 +3134,8 @@ module OneM2M_Templates {
labels := ?,//M
accessControlPolicyIDs := ?,//M
expirationTime := ?,//M
- dynamicAuthorizationConsultationIDs := *, //O
link := ?,//M
+ dynamicAuthorizationConsultationIDs := *, //O
nodeID := ?,//M
hostedCSELink := *,//O
hostedAELinks := *,//O
@@ -3324,16 +3324,16 @@ module OneM2M_Templates {
resourceType := omit, //NP
resourceID := omit, //NP
parentID := omit, //NP
- accessControlPolicyIDs := omit, //O
creationTime := omit, //NP
- expirationTime := omit, //O
lastModifiedTime := omit, //NP
labels := omit, //O
+ accessControlPolicyIDs := omit, //O
+ expirationTime := omit, //O
+ dynamicAuthorizationConsultationIDs := omit, //O
announceTo := omit, //O
announcedAttribute := omit, //O
- dynamicAuthorizationConsultationIDs := omit, //O
- creator := omit, //O
stateTag := omit, //NP
+ creator := omit, //O
choice := omit //NP
};
@@ -3344,14 +3344,14 @@ module OneM2M_Templates {
resourceType := omit, //NP
resourceID := omit, //NP
parentID := omit, //NP
- accessControlPolicyIDs := omit, //O
creationTime := omit, //NP
- expirationTime := omit, //O
lastModifiedTime := omit, //NP
labels := omit, //O
+ accessControlPolicyIDs := omit, //O
+ expirationTime := omit, //O
+ dynamicAuthorizationConsultationIDs := omit, //O
announceTo := omit, //O
announcedAttribute := omit, //O
- dynamicAuthorizationConsultationIDs := omit, //O
creator := omit, //O
description := omit, //O
ontologyFormat := p_ontologyFormat, //M
@@ -3370,14 +3370,14 @@ module OneM2M_Templates {
resourceType := omit, //NP
resourceID := omit, //NP
parentID := omit, //NP
- accessControlPolicyIDs := omit, //O
creationTime := omit, //NP
- expirationTime := omit, //O
lastModifiedTime := omit, //NP
labels := omit, //O
+ accessControlPolicyIDs := omit, //O
+ expirationTime := omit, //O
+ dynamicAuthorizationConsultationIDs := omit, //O
announceTo := omit, //O
announcedAttribute := omit, //O
- dynamicAuthorizationConsultationIDs := omit, //O
creator := omit, //O
descriptorRepresentation := p_descriptorRepresentation, //M
semanticOpExec := omit, //NP
@@ -3398,14 +3398,14 @@ module OneM2M_Templates {
resourceType := omit, //NP
resourceID := omit, //NP
parentID := omit, //NP
- accessControlPolicyIDs := *, //O
creationTime := omit, //NP
- expirationTime := *, //O
lastModifiedTime := omit, //NP
labels := *, //O
+ accessControlPolicyIDs := *, //O
+ expirationTime := *, //O
+ dynamicAuthorizationConsultationIDs := *, //O
announceTo := *, //O
announcedAttribute := *, //O
- dynamicAuthorizationConsultationIDs := *, //O
creator := *, //O
descriptorRepresentation := ?, //M
semanticOpExec := omit, //NP
@@ -5808,14 +5808,14 @@ module OneM2M_Templates {
resourceType := omit, //NP
resourceID := omit, //NP
parentID := omit, //NP
- accessControlPolicyIDs := omit, //O
creationTime := omit, //NP
- expirationTime := omit, //O
lastModifiedTime := omit, //NP
labels := omit, //O
+ accessControlPolicyIDs := omit, //O
+ expirationTime := omit, //O
+ dynamicAuthorizationConsultationIDs := omit, //O
announceTo := omit, //O
announcedAttribute := omit, //O
- dynamicAuthorizationConsultationIDs := omit, //O
creator := omit, //O
descriptorRepresentation := omit, //M
semanticOpExec := omit, //NP
@@ -6546,10 +6546,10 @@ module OneM2M_Templates {
resourceType := int16,//M
resourceID := p_componentDesc.cseResourceId,//M
pointOfAccess := {p_pointOfAccess},//O
- e2eSecInfo := p_e2eSecInfo,//O
cSEBase := p_componentDesc.cseId & "/" & p_componentDesc.cseName,//M
cSE_ID := p_componentDesc.cseId,//M
- requestReachability := true//M
+ requestReachability := true,//M
+ e2eSecInfo := p_e2eSecInfo//O
};
@@ -6747,19 +6747,19 @@ module OneM2M_Templates {
MashupMemberStoreType p_memberStoreType := int1,
MashupResultGenType p_resultGenType := int1 ) := { //when SMI is created
+ resourceName := p_resourceName, //M
resourceType := int41, //M
resourceID := omit, //M
- resourceName := p_resourceName, //M
parentID := p_parentID, //M
- expirationTime := p_expirationTime, //M
- accessControlPolicyIDs := omit, //O
- labels := omit, //O
creationTime := p_creationTime, //M
lastModifiedTime := p_lastModifiedTime, //M
+ labels := omit, //O
+ accessControlPolicyIDs := omit, //O
+ expirationTime := p_expirationTime, //M
+ dynamicAuthorizationConsultationIDs := omit, //O
announceTo := omit, //O
announcedAttribute := omit, //O
creator := omit, //O
- dynamicAuthorizationConsultationIDs := omit, //O
smjpID := p_smjpID, //M
smjpInputParameter := omit,//O
memberStoreType := p_memberStoreType, //M
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 94b75c6..51d4962 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -10509,10 +10509,10 @@ module OneM2M_PermutationFunctions {
// Test Body
if (p_resourceType == int4) {
- v_create := m_createContainerBase;
+ v_create := valueof(m_createContainerBase);
v_resourceIndex := f_cse_createResource(int3,v_create, v_aeIndex);
} else if (p_resourceType == int30) {
- v_create := m_createTimeSeriesBase;
+ v_create := valueof(m_createTimeSeriesBase);
v_resourceIndex := f_cse_createResource(int29,v_create, v_aeIndex);
}
@@ -10869,7 +10869,7 @@ module OneM2M_PermutationFunctions {
// Test Body
vc_cse1.start(f_cse_retrieveResourceHandler(v_originalResourceIndex, -, -));
- v_request := m_retrieve(v_resourceAnncAddress, f_getOriginator(v_aeIndex));
+ v_request := valueof(m_retrieve(v_resourceAnncAddress, f_getOriginator(v_aeIndex)));
v_request.resultContent := int7;
f_send(e_mcaPort, m_request(v_request));
diff --git a/OneM2M_Testcases_CSE_Release_3.ttcn b/OneM2M_Testcases_CSE_Release_3.ttcn
index a5f66f0..ee869b5 100644
--- a/OneM2M_Testcases_CSE_Release_3.ttcn
+++ b/OneM2M_Testcases_CSE_Release_3.ttcn
@@ -17847,7 +17847,7 @@ module OneM2M_Testcases_CSE_Release_3 {
p_createRequestPrimitive.primitiveContent.semanticDescriptor.descriptor := c_validDescriptor;
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex);
- v_retrieveRequest := m_retrieveFilterCriteria(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex), v_filterCriteria);
+ v_retrieveRequest := valueof(m_retrieveFilterCriteria(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex), v_filterCriteria));
v_retrieveRequest.semanticQueryIndicator := true;
v_retrieveRequest.resultContent := int10; //ResultContent = 10 (Semantic Content)
@@ -17916,7 +17916,7 @@ module OneM2M_Testcases_CSE_Release_3 {
p_createRequestPrimitive.primitiveContent.semanticDescriptor.descriptor := c_validDescriptor;
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex);
- v_retrieveRequest := m_retrieveFilterCriteria(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex), v_filterCriteria);
+ v_retrieveRequest := valueof(m_retrieveFilterCriteria(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex), v_filterCriteria));
v_retrieveRequest.semanticQueryIndicator := true;
v_retrieveRequest.resultContent := int10; //ResultContent = 10 (Semantic Content)
--
GitLab