Compilation fixes for HAIM group

Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parent 73a52d7b
......@@ -4100,7 +4100,7 @@ module OneM2M_Functions {
[] mcaPortIn.receive(mw_request(p_request)) -> value vc_request {
tc_ac.stop;
v_localResourceIndex := f_processCreateRequestPrimitive(vc_request.primitive.requestPrimitive);
mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
}
[] tc_ac.timeout {
setverdict(inconc, __SCOPE__&":INFO: No creation for resource received");
......
......@@ -734,9 +734,6 @@ module OneM2M_PermutationFunctions {
function f_AE_HAIM_CRE_001(in universal charstring p_action, in template UtTriggerPrimitive p_utRequest, in template RequestPrimitive p_requestPrimitive) runs on CseSimu {
var integer v_resourceIndex := -1;
v_utRequest.requestPrimitive.primitiveContent.flexContainer.containerDefinition := p_containerDefinition;
v_requestPrimitive.primitiveContent.flexContainer.containerDefinition := p_containerDefinition;
//Test component configuration
f_cf03Up();
......@@ -749,17 +746,17 @@ module OneM2M_PermutationFunctions {
//Test behavior
tc_ac.start;
alt{
[] mcaPortIn.receive(mw_request(v_requestPrimitive)) -> value vc_request {
[] mcaPortIn.receive(mw_request(p_requestPrimitive)) -> value vc_request {
tc_ac.stop;
setverdict(pass, __SCOPE__ & " : Device model creation request is accepted");
v_resourceIndex := f_processCreateRequestPrimitive(vc_request.primitive.requestPrimitive);
mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
}
[] mcaPortIn.receive(mw_request(mw_create)) -> value vc_request {
tc_ac.stop;
//Send Response
v_resourceIndex := f_processCreateRequestPrimitive(vc_request.primitive.requestPrimitive);
mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
tc_ac.start;
repeat;
}
......@@ -798,13 +795,13 @@ module OneM2M_PermutationFunctions {
tc_ac.stop;
setverdict(pass, __SCOPE__ & " : Module class creation request is accepted");
v_resourceIndex := f_processCreateRequestPrimitive(vc_request.primitive.requestPrimitive);
mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
}
[] mcaPortIn.receive(mw_request(mw_create)) -> value vc_request {
tc_ac.stop;
//Send response
v_resourceIndex := f_processCreateRequestPrimitive(vc_request.primitive.requestPrimitive);
mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
tc_ac.start;
repeat;
}
......@@ -846,8 +843,8 @@ module OneM2M_PermutationFunctions {
[v_deviceInfoCreated] mcaPortIn.receive(mw_request(p_requestPrimitive)) -> value vc_request {
tc_ac.stop;
v_resourceIndex := f_processCreateRequestPrimitive(vc_request.primitive.requestPrimitive);
mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
if(f_checkNodeLink(vc_request.primitiveContent, f_getResourceAddress(v_resourceIndexNode)))
f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
if(f_checkNodeLink(vc_request.primitive.requestPrimitive.primitiveContent, f_getResourceAddress(v_resourceIndexNode)))
{
setverdict(pass, __SCOPE__ & " : Device model Properties creation request is correct");
}
......@@ -862,7 +859,7 @@ module OneM2M_PermutationFunctions {
v_nodeCreated := true;
//Set deviceInfo parent
v_requestPrimitiveDeviceInfo.to_ := f_getResourceAddress(v_resourceIndexNode);
mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
tc_ac.start;
repeat;
}
......@@ -870,7 +867,7 @@ module OneM2M_PermutationFunctions {
tc_ac.stop;
v_resourceIndexDeviceInfo := f_processCreateRequestPrimitive(vc_request.primitive.requestPrimitive);
v_deviceInfoCreated := true;
mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
tc_ac.start;
repeat;
}
......@@ -878,7 +875,7 @@ module OneM2M_PermutationFunctions {
tc_ac.stop;
//Send Response
v_resourceIndex := f_processCreateRequestPrimitive(vc_request.primitive.requestPrimitive);
mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
tc_ac.start;
repeat;
}
......@@ -917,13 +914,13 @@ module OneM2M_PermutationFunctions {
tc_ac.stop;
setverdict(pass, __SCOPE__ & " : Module class creation request contains required Properties");
v_resourceIndex := f_processCreateRequestPrimitive(vc_request.primitive.requestPrimitive);
mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
}
[] mcaPortIn.receive(mw_request(mw_create)) -> value vc_request {
tc_ac.stop;
//Send response
v_resourceIndex := f_processCreateRequestPrimitive(vc_request.primitive.requestPrimitive);
mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
tc_ac.start;
repeat;
}
......@@ -962,13 +959,13 @@ module OneM2M_PermutationFunctions {
tc_ac.stop;
setverdict(pass, __SCOPE__ & " : Module class creation request contains required DataPoints");
v_resourceIndex := f_processCreateRequestPrimitive(vc_request.primitive.requestPrimitive);
mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
}
[] mcaPortIn.receive(mw_request(mw_create)) -> value vc_request {
tc_ac.stop;
//Send response
v_resourceIndex := f_processCreateRequestPrimitive(vc_request.primitive.requestPrimitive);
mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
tc_ac.start;
repeat;
}
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment