From 345ccf67957bb10b8ac923bfb0ce059f34b922f3 Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Mon, 25 May 2020 09:51:55 +0200
Subject: [PATCH] Fix for f_cf02Up when using vc_aeSimuDesc +using global
variable as default parameter values
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
LibOneM2M/OneM2M_Functions.ttcn | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index e078e33..a7ec63b 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -105,7 +105,7 @@ module OneM2M_Functions {
vc_config := e_cf02;
vc_testSystemRole := e_ae;
vc_cse1 := CseSimu.create("CSE1") alive;
- vc_aeSimuDesc := vc_aeSimuDesc;
+ vc_aeSimuDesc := PX_TS_AE1;
// Map
map(self:mcaPort, system:mcaPort) param (vc_aeSimuDesc.mcaPort);
@@ -115,7 +115,7 @@ module OneM2M_Functions {
map(self:utPort, system:utPort) param (PX_TS_UT);
}
- f_setProtocolBinding(PX_TS_AE1.mcaPort, PX_TS_AE1.mcaPortIn, v_binding, v_host, v_binding_in);
+ f_setProtocolBinding(vc_aeSimuDesc.mcaPort, vc_aeSimuDesc.mcaPortIn, v_binding, v_host, v_binding_in);
vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPort))] := { mcaPort, v_host, v_binding, vc_aeSimuDesc.mcaPort.serialization };
vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPortIn))] := { mcaPortIn, v_host, v_binding_in, vc_aeSimuDesc.mcaPortIn.serialization };
@@ -2614,12 +2614,12 @@ module OneM2M_Functions {
if(valueof(p_requestPrimitive.primitiveContent.aEAnnc.link) == "S") {
p_requestPrimitive.primitiveContent.aEAnnc.link := f_getLocalResourceAddress() & "S";
} else {
- v_originalResourceIndex := f_generateAndSetLocalResource(m_primitiveContentAe(m_contentCreateAe(omit, -, PX_TS_AE1.appId,omit)), vc_cSEBaseIndex, int2);
+ v_originalResourceIndex := f_generateAndSetLocalResource(m_primitiveContentAe(m_contentCreateAe(omit, -, PX_TS_AE1.appId,omit)), -, int2);
p_requestPrimitive.primitiveContent := f_setLink(valueof(p_requestPrimitive.primitiveContent), f_getLocalResourceAddress(v_originalResourceIndex));
}
}
} else if (p_resourceType == int10003) {
- v_originalResourceIndex := f_generateAndSetLocalResource(m_primitiveContentContainer(m_contentCreateContainer), vc_cSEBaseIndex, int3);
+ v_originalResourceIndex := f_generateAndSetLocalResource(m_primitiveContentContainer(m_contentCreateContainer), -, int3);
p_requestPrimitive.primitiveContent := f_setLink(valueof(p_requestPrimitive.primitiveContent), f_getLocalResourceAddress(v_originalResourceIndex));
}
//TODO Add other resource types
@@ -2638,7 +2638,7 @@ module OneM2M_Functions {
if(valueof(p_requestPrimitive.primitiveContent.aEAnnc.link) == "S") {
v_originalResource.aE := m_contentCreateAe(omit, -, PX_TS_AE1.appId, omit);
v_originalResource.aE.aE_ID := vc_response.primitive.responsePrimitive.primitiveContent.aEAnnc.aE_ID;
- v_resourceIndex := f_generateAndSetLocalResource(valueof(v_originalResource), vc_cSEBaseIndex, int2);
+ v_resourceIndex := f_generateAndSetLocalResource(valueof(v_originalResource), -, int2);
}
}
}
@@ -3854,10 +3854,10 @@ module OneM2M_Functions {
//Create original resource locally if resource type is an announced variant
if(p_resourceType == int10002) {
- v_originalResourceIndex := f_generateAndSetLocalResource(m_primitiveContentAe(m_contentCreateAe(omit, -, PX_TS_AE1.appId, omit)), vc_cSEBaseIndex, int2);
+ v_originalResourceIndex := f_generateAndSetLocalResource(m_primitiveContentAe(m_contentCreateAe(omit, -, PX_TS_AE1.appId, omit)), -, int2);
p_requestPrimitive.primitiveContent := f_setLink(valueof(p_requestPrimitive.primitiveContent), f_getLocalResourceAddress(v_originalResourceIndex));
} else if (p_resourceType == int10003) {
- v_originalResourceIndex := f_generateAndSetLocalResource(m_primitiveContentContainer(m_contentCreateContainer), vc_cSEBaseIndex, int3);
+ v_originalResourceIndex := f_generateAndSetLocalResource(m_primitiveContentContainer(m_contentCreateContainer), -, int3);
p_requestPrimitive.primitiveContent := f_setLink(valueof(p_requestPrimitive.primitiveContent), f_getLocalResourceAddress(v_originalResourceIndex));
}
//TODO Add other resource types
--
GitLab