Commit b6fe0dda authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega

Merge remote-tracking branch 'remotes/origin/STF531_ProtocolBinding'

Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parents 30000a39 b3cb950d
......@@ -2922,11 +2922,11 @@ module OneM2M_Functions {
v_modifiedResource := f_generateLocalResource(v_rp.primitiveContent, v_parentIndex, v_rp.resourceType);
v_resourceIndex := f_setLocalResource(v_modifiedResource, int2, v_parentIndex);
if(v_resourceIndex != -1) {
mcaPortIn.send(m_response(m_responsePrimitive_content(int2001, v_rp.requestIdentifier, v_modifiedResource)));
mcaPortIn.send(f_getMsgOutPrimitive(m_response(m_responsePrimitive_content(int2001, v_rp.requestIdentifier, v_modifiedResource))));
setverdict(pass, __SCOPE__&":INFO: Polling Channel created successfuly");
}
else {
mcaPortIn.send(m_response(m_responsePrimitive(int5000, v_request.primitive.requestPrimitive.requestIdentifier)));
mcaPortIn.send(f_getMsgOutPrimitive(m_response(m_responsePrimitive(int5000, v_request.primitive.requestPrimitive.requestIdentifier))));
setverdict(inconc, __SCOPE__&":INFO: Polling Channel creation failed");
}
}
......
......@@ -2336,7 +2336,7 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getCreateRequestPrimitive(p_resourceTypeChild, p_requestPrimitiveChild2, v_parentIndex); ////Child2
mcaPort.send(m_request(v_request));
mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
......@@ -2398,7 +2398,7 @@ module OneM2M_PermutationFunctions {
v_request := f_getCreateRequestPrimitive(p_resourceTypeChild, p_requestPrimitiveChild2, v_parentIndex); //Child2
mcaPort.send(m_request(v_request));
mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
......@@ -2547,7 +2547,7 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getCreateRequestPrimitive(p_resourceTypeChild, p_requestPrimitiveChild, v_parentIndex);
mcaPort.send(m_request(v_request));
mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int5207))) -> value v_response {
......@@ -4861,7 +4861,7 @@ module OneM2M_PermutationFunctions {
f_cse_updateResource(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
mcaPort.send(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)))));
tc_ac.start;
alt {
......@@ -4912,7 +4912,7 @@ module OneM2M_PermutationFunctions {
//Test Body
v_request := f_getUpdateRequestPrimitive(p_resourceTypeChild, v_childIndex, p_updateRequestPrimitive);
mcaPort.send(m_request(v_request));
mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response {
......@@ -5300,7 +5300,7 @@ module OneM2M_PermutationFunctions {
v_responsePrimitive := valueof(m_responsePrimitive(int2004,v_request.primitive.requestPrimitive.requestIdentifier));
v_responsePrimitive.from_ := PX_CSE1_ID;
v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_;
mccPortIn.send(m_response(v_responsePrimitive));
mccPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ":ERROR: No announcement received");
......@@ -5568,7 +5568,7 @@ module OneM2M_PermutationFunctions {
v_childResourceIndex := f_cse_createResource(p_resourceTypeChild, p_requestPrimitiveChild, v_resourceIndex);
// Test Body
mcaPort.send(m_request(m_delete(f_getResourceAddress(v_childResourceIndex), f_getOriginator(v_childResourceIndex))));
mcaPort.send(f_getMsgOutPrimitive(m_request(m_delete(f_getResourceAddress(v_childResourceIndex), f_getOriginator(v_childResourceIndex)))));
tc_ac.start;
alt {
......@@ -6252,7 +6252,7 @@ module OneM2M_PermutationFunctions {
v_request := f_getCreateRequestPrimitive(int23, v_createSubscriptionRequest, v_childResourceIndex);//Subscription under child
// Test Body
mcaPort.send(m_request(v_request));
mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int5203))) -> value v_response {
......@@ -8816,7 +8816,7 @@ module OneM2M_PermutationFunctions {
v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
v_request := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
mcaPort.send(m_request(v_request));
mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
v_requestNotify := valueof(m_notify(f_getResourceAddress(v_aeIndex)));
......@@ -8880,7 +8880,7 @@ module OneM2M_PermutationFunctions {
vc_cse1.start(f_cse_notifyProcedure_notify(v_requestNotify));
v_request := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
mcaPort.send(m_request(v_request));
mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
tc_ac.start;
alt {
......@@ -8937,7 +8937,7 @@ module OneM2M_PermutationFunctions {
v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
v_request := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
mcaPort.send(m_request(v_request));
mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
v_requestNotify := valueof(m_notify(f_getResourceAddress(v_aeIndex)));
vc_cse1.start(f_cse_notifyProcedure_notify(v_requestNotify));
......@@ -8965,7 +8965,7 @@ module OneM2M_PermutationFunctions {
}
}
mcaPort.send(m_request(v_requestNotify));
mcaPort.send(f_getMsgOutPrimitive(m_request(v_requestNotify)));
//Postamble
f_cse_postamble_deleteResources();
......@@ -9020,7 +9020,7 @@ module OneM2M_PermutationFunctions {
//Put in the primitiveContent a Notify request (req2) (simulated) from another node CSE
v_request_req2 := valueof(m_notify(f_getResourceAddress(vc_remoteCseIndex)));
v_response_rsp1.primitiveContent := { requestPrimitive := v_request_req2 };
mccPortIn.send(m_response(v_response_rsp1));
mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response_rsp1)));
}
[] tc_ac.timeout {
setverdict(inconc, __SCOPE__&":INFO: No request received for creating resource type Polling Channel");
......@@ -9076,7 +9076,7 @@ module OneM2M_PermutationFunctions {
p_aeIndex2 := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//c_CRDNDi);
//v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
mcaPort.send(m_request(p_requestprimitive));
mcaPort.send(f_getMsgOutPrimitive(m_request(p_requestprimitive)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) {
......@@ -9118,7 +9118,7 @@ module OneM2M_PermutationFunctions {
v_requestNotify := valueof(m_notify(f_getResourceAddress(v_aeIndex)));
v_request.from_ := PX_CSE1_ID;
mccPort.send(m_request(v_request));
mccPort.send(f_getMsgOutPrimitive(m_request(v_request)));
tc_ac.start;
alt {
[] mccPort.receive(mw_response(mw_responsePrimitive(int4108))) -> value vc_response {
......
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