Corrections and adaptations to latest changes in PollingChannel TPs

Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parent 94a87976
......@@ -3344,7 +3344,7 @@ module OneM2M_PermutationFunctions {
}//end f_CSE_DMR_RET_007
function f_CSE_DMR_RET_008(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu {
function f_CSE_DMR_RET_008(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, AttributeList_1 p_attributeList) runs on AeSimu {
// Local variables
var MsgIn v_response;
......@@ -3368,7 +3368,7 @@ module OneM2M_PermutationFunctions {
// Test Body
mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
{"lbl", "at"}, f_getOriginator(v_resourceIndex)))));
p_attributeList, f_getOriginator(v_resourceIndex)))));
tc_ac.start;
alt {
......@@ -9102,7 +9102,7 @@ module OneM2M_PermutationFunctions {
f_cf02DownCseSimuMaster();
}
function f_CSE_PCH_005(inout integer p_aeIndex1, inout integer p_aeIndex2, RequestPrimitive p_requestprimitive) runs on AeSimu {
function f_CSE_PCH_005(template RequestPrimitive p_requestPrimitive) runs on AeSimu {
//Local variables
var integer v_aeIndex1 := -1;
......@@ -9123,18 +9123,19 @@ module OneM2M_PermutationFunctions {
// Preamble
v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);//c_CUDNDi)
f_checkAeSimuStatus();
p_aeIndex1 := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//c_CRDNDi);
v_aeIndex1 := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//c_CRDNDi);
f_checkAeSimuStatus();
vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, {f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, PX_AE2_ID_STEM, c_defaultAE2Name, -), -1)); // AE2 is registred
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
v_aeIndex2 := f_getResource(vc_ae2);
v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex1);
p_aeIndex2 := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//c_CRDNDi);
f_checkAeSimuStatus();
p_requestPrimitive.to_ := f_getResourceAddress(v_resourceIndex);
p_requestPrimitive.from_ := f_getOriginator(v_aeIndex2);
//v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
mcaPort.send(f_getMsgOutPrimitive(m_request(p_requestprimitive)));
mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) {
......@@ -9157,60 +9158,6 @@ module OneM2M_PermutationFunctions {
f_cf01Down();
}
function f_CSE_PCH_006() runs on CseSimu {
// Local variables
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var RequestPrimitive v_request;
var MsgIn v_response;
var RequestPrimitive v_requestNotify;
// Test control
// Test component configuration
f_cf02UpCseSimuMaster();
// Test adapter configuration
// Preamble
vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
f_checkCseSimuStatus();
vc_ae1.start(f_cse_preamble_registerAe());//AE1 is registred;
f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
v_aeIndex := f_getResource(vc_ae1);
vc_ae1.start(f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex));//PollingChannel is created;
f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
v_requestNotify := valueof(m_notify(f_getResourceAddress(v_aeIndex)));
v_request.from_ := PX_CSE1_ID;
mccPort.send(f_getMsgOutPrimitive(m_request(v_request)));
tc_ac.start;
alt {
[] mccPort.receive(mw_response(mw_responsePrimitive(int4108))) -> value vc_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ":Response status code set to 4108 (REQUEST_TIMEOUT)");
}
[] mccPort.receive(mw_response()) {
tc_ac.stop;
setverdict(fail, __SCOPE__&":INFO: Unexpected message received");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__&":INFO: No answer while performing notification");
}
}
// Postamble
f_cse_postamble_deleteResourcesCSE();
// Tear down
f_cf02DownCseSimuMaster();
} // end f_CSE_PCH_006
} //end group PollingChannel
group Non_Blocking_Requests{
......
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