Commit 36c1b68e authored by Yann Garcia's avatar Yann Garcia
Browse files

Review BindingDesc & TestSystemSettingsDesc

Remove function f_getMsgOutPrimitive
parent 40acc28b
This diff is collapsed.
......@@ -119,7 +119,7 @@ module OneM2M_Pixits {
tsAddress := "192.168.56.102",
remotePort := 9010, // SUT CoAP/HTTP port
localPort := 3031, // Test Adapter client port (for debug purpose only)
sutAddress := omit
sutAddress := "192.168.56.103"
}
}
},
......@@ -133,7 +133,7 @@ module OneM2M_Pixits {
tsAddress := "192.168.56.102",
remotePort := 9010,
localPort := 3041, // Test Adapter listener port (AeSimu acts as server)
sutAddress := omit
sutAddress := "192.168.56.103"
}
}
},
......@@ -149,7 +149,7 @@ module OneM2M_Pixits {
tsAddress := "192.168.56.102",
remotePort := 9010, // SUT CoAP/HTTP port
localPort := 3032, // Test Adapter client port (for debug purpose only)
sutAddress := omit
sutAddress := "192.168.56.103"
}
}
},
......@@ -163,7 +163,7 @@ module OneM2M_Pixits {
tsAddress := "192.168.56.102",
remotePort := omit,
localPort := 3042, // Test Adapter listener port (AeSimu acts as server)
sutAddress := omit
sutAddress := "192.168.56.103"
}
}
},
......@@ -179,7 +179,7 @@ module OneM2M_Pixits {
tsAddress := "192.168.56.102",
remotePort:= 9010,
localPort := 3131,
sutAddress := omit
sutAddress := "192.168.56.103"
}
}
},
......@@ -193,7 +193,7 @@ module OneM2M_Pixits {
tsAddress := "192.168.56.102",
remotePort:= omit,
localPort := 3141,
sutAddress := omit
sutAddress := "192.168.56.103"
}
}
},
......@@ -207,7 +207,7 @@ module OneM2M_Pixits {
tsAddress := "192.168.56.102",
remotePort:= 9011,
localPort := 4131,
sutAddress := omit
sutAddress := "192.168.56.103"
}
}
},
......@@ -221,14 +221,13 @@ module OneM2M_Pixits {
tsAddress := "192.168.56.102",
remotePort:= 9011,
localPort := 4141,
sutAddress := omit
sutAddress := "192.168.56.103"
}
}
},
serialization := e_xml
}
},
SUT := { sutAddress := "192.168.56.103" },
UT := omit
};
......
......@@ -31,7 +31,7 @@ module OneM2M_Ports {
MsgIn;
out
MsgOut;
map param (in PortDesc p_portDesc, in charstring p_sutAddress);
map param (in PortDesc p_portDesc);
};
/**
......
......@@ -8780,7 +8780,7 @@ type record BindingDesc {
charstring tsAddress,
integer remotePort optional,
integer localPort optional,
charstring sutAddress optional
charstring sutAddress
}
/**
......@@ -8846,18 +8846,12 @@ type record SutDesc {
}
/**
* @desc UpperTester component settinmgs
* @desc UpperTester component settings
* @member requestId
* @member tsAddress Test System IP address
* @member tsRemotePort Test System UpperTester listener port
* @member sutAddress SUT IP address
* @member sutRemotePort IUT UpperTester listener port
* @member url Test System IP address
*/
type record UtDesc {
charstring tsAddress,
integer utApplicationPort,
charstring utApplicationAddress optional,
charstring utApplicationUrl
charstring url
}
/**
......@@ -8896,7 +8890,6 @@ type record TestSystemSettingsDesc {
AeSimuComponentDesc AE1,
AeSimuComponentDesc AE2,
CseSimuComponentDesc CSE1,
SutDesc SUT,
UtDesc UT optional
}
......
This diff is collapsed.
......@@ -489,12 +489,12 @@ module OneM2M_Testcases_AE_Release_1 {
v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);
//send back responsePrimitive
f_send(e_mca_in_port, 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_createAe())) -> value v_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & " : Unexpected AE registration request");
f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
}
[] tc_ac.timeout{
setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
......@@ -693,12 +693,12 @@ module OneM2M_Testcases_AE_Release_1 {
v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
f_send(e_mca_in_port, m_response(v_responsePrimitive));
}
[] mcaPortIn.receive (mw_request(mw_delete(?))) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & " : Unexpected DELETE request");
f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
}
[] tc_ac.timeout{
setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
......@@ -754,12 +754,12 @@ module OneM2M_Testcases_AE_Release_1 {
setverdict(pass, __SCOPE__ & " : Container creation request is accepted!");
v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);
//send back responsePrimitive
f_send(e_mca_in_port, f_getMsgOutPrimitive(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 v_request{
tc_ac.stop;
setverdict(fail, __SCOPE__ & " : Unexpected CREATE request ");
f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
}
[] tc_ac.timeout{
setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
......@@ -812,12 +812,12 @@ module OneM2M_Testcases_AE_Release_1 {
setverdict(pass, __SCOPE__ & " : ContentInstance creation request is accepted!!");
v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);
//send back responsePrimitive
f_send(e_mca_in_port, f_getMsgOutPrimitive(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 v_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & " : Unexpected CREATE request ");
f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
}
[] tc_ac.timeout{
setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
......@@ -1313,12 +1313,12 @@ module OneM2M_Testcases_AE_Release_1 {
tc_ac.stop;
setverdict(pass, __SCOPE__ & " : retrieve attribute oldest request is accepted!");
v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
f_send(e_mca_in_port, m_response(v_responsePrimitive));
}
[] mcaPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & " : Retrieve Request for unexpected target");
f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
}
[] tc_ac.timeout{
setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
......@@ -1373,12 +1373,12 @@ module OneM2M_Testcases_AE_Release_1 {
tc_ac.stop;
setverdict(pass, __SCOPE__ & " : retrieve attribute latest request is accepted!!");
v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
f_send(e_mca_in_port, m_response(v_responsePrimitive));
}
[] mcaPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & " : Retrieve Request for unexpected target");
f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
}
[] tc_ac.timeout{
setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
......@@ -1429,12 +1429,12 @@ module OneM2M_Testcases_AE_Release_1 {
tc_ac.stop;
setverdict(pass, __SCOPE__ & " : retrieve resource type request is accepted!!");
v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
f_send(e_mca_in_port, m_response(v_responsePrimitive));
}
[] mcaPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & " : Retrieve Request for unexpected target");
f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
}
[] tc_ac.timeout{
setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
......@@ -1487,12 +1487,12 @@ module OneM2M_Testcases_AE_Release_1 {
tc_ac.stop;
setverdict(pass, __SCOPE__ & " : retrieve resource type request is accepted!!");
v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
f_send(e_mca_in_port, m_response(v_responsePrimitive));
}
[] mcaPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & " : Retrieve Request for unexpected target");
f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
}
[] tc_ac.timeout{
setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
......@@ -1551,13 +1551,13 @@ module OneM2M_Testcases_AE_Release_1 {
v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
f_send(e_mca_in_port, m_response(v_responsePrimitive));
tc_ac.stop;
}
[] mcaPortIn.receive (mw_request(mw_delete(?))) -> value v_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & " : Delete request for unexpected target");
f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
}
[] tc_ac.timeout{
setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
......@@ -1612,13 +1612,13 @@ module OneM2M_Testcases_AE_Release_1 {
v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
f_send(e_mca_in_port, m_response(v_responsePrimitive));
tc_ac.stop;
}
[] mcaPortIn.receive (mw_request(mw_delete(?))) -> value v_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & " : Delete request for unexpected target");
f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
}
[] tc_ac.timeout{
setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
......@@ -1673,13 +1673,13 @@ module OneM2M_Testcases_AE_Release_1 {
v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
f_send(e_mca_in_port, m_response(v_responsePrimitive));
tc_ac.stop;
}
[] mcaPortIn.receive (mw_request(mw_delete(?))) -> value v_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & " : Delete request for unexpected target");
f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
}
[] tc_ac.timeout{
setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
......@@ -1736,13 +1736,13 @@ module OneM2M_Testcases_AE_Release_1 {
v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
f_send(e_mca_in_port, m_response(v_responsePrimitive));
tc_ac.stop;
}
[] mcaPortIn.receive (mw_request(mw_delete(?))) -> value v_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & " : Delete request for unexpected target");
f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
}
[] tc_ac.timeout{
setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
......@@ -1804,12 +1804,12 @@ module OneM2M_Testcases_AE_Release_1 {
v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
//send back responsePrimitive
f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
f_send(e_mca_in_port, m_response(v_responsePrimitive));
}
[] mcaPortIn.receive {
tc_ac.stop;
setverdict(fail, __SCOPE__ & " : Subscription creation request is rejected due to not including mandatory attributes!!");
f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
}
[] tc_ac.timeout{
setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
......@@ -1990,12 +1990,12 @@ module OneM2M_Testcases_AE_Release_1 {
v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
//send back responsePrimitive
f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
f_send(e_mca_in_port, m_response(v_responsePrimitive));
}
[] mcaPortIn.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {
tc_ac.stop;
setverdict(inconc, __SCOPE__ & " : AE registration request is rejected due to not including mandatory attributes!!");
f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
}
[] tc_ac.timeout{
setverdict(inconc, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
......@@ -2022,12 +2022,12 @@ module OneM2M_Testcases_AE_Release_1 {
v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
//send back responsePrimitive
f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
f_send(e_mca_in_port, m_response(v_responsePrimitive));
}
[] mcaPortIn.receive {
tc_ac.stop;
setverdict(inconc, __SCOPE__ & " : Subscription creation request is rejected due to not including mandatory attributes!!");
f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
}
[] tc_ac.timeout{
setverdict(inconc, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
......@@ -2037,7 +2037,7 @@ module OneM2M_Testcases_AE_Release_1 {
f_checkCseSimuStatus();
//Test behavior
f_send(e_mca_in_port, f_getMsgOutPrimitive(m_request(m_notify(f_getLocalResourceAddress(v_resourceIndex)))));
f_send(e_mca_in_port, m_request(m_notify(f_getLocalResourceAddress(v_resourceIndex))));
tc_ac.start;
alt{
......@@ -2099,12 +2099,12 @@ module OneM2M_Testcases_AE_Release_1 {
v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
//send back responsePrimitive
f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
f_send(e_mca_in_port, m_response(v_responsePrimitive));
}
[] mcaPortIn.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {
tc_ac.stop;
setverdict(inconc, __SCOPE__ & " : AE registration request is rejected due to not including mandatory attributes!!");
f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
}
[] tc_ac.timeout{
setverdict(inconc, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
......@@ -2131,12 +2131,12 @@ module OneM2M_Testcases_AE_Release_1 {
v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
//send back responsePrimitive
f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
f_send(e_mca_in_port, m_response(v_responsePrimitive));
}
[] mcaPortIn.receive {
tc_ac.stop;
setverdict(inconc, __SCOPE__ & " : Subscription creation request is rejected due to not including mandatory attributes!!");
f_send(e_mca_in_port, f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
}
[] tc_ac.timeout{
setverdict(inconc, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
......@@ -2146,7 +2146,7 @@ module OneM2M_Testcases_AE_Release_1 {
f_checkCseSimuStatus();
//Test behavior
f_send(e_mca_in_port, f_getMsgOutPrimitive(m_request(m_notifyAggregatedNotification)));
f_send(e_mca_in_port, m_request(m_notifyAggregatedNotification));
tc_ac.start;
alt{
......
This diff is collapsed.
......@@ -43,7 +43,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_request := valueof(m_delete(v_resourceAddress, PX_SUPER_AE_ID));
f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
f_send(e_mca_port, m_request(v_request));
t_ac.start;
alt {
......@@ -2760,7 +2760,7 @@ module OneM2M_Testcases_CSE_Release_2 {
vc_ae2.start(f_cse_notifyProcedure_subscriptionVerificationHandler());
f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, omit))) -> value v_response {
......@@ -2900,7 +2900,7 @@ module OneM2M_Testcases_CSE_Release_2 {
// Test Body
v_request := f_getCreateRequestPrimitive(int23, v_createRequest, v_aeIndex);//Subscription
f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
......@@ -2975,7 +2975,7 @@ module OneM2M_Testcases_CSE_Release_2 {
// Test Body
v_request := f_getCreateRequestPrimitive(int23, v_createRequest, v_aeIndex);//Subscription
f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
......@@ -3154,7 +3154,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest);
f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
......@@ -3237,7 +3237,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest);
f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
......@@ -3325,7 +3325,7 @@ module OneM2M_Testcases_CSE_Release_2 {
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)))));
f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
tc_ac.start;
alt {
......@@ -3416,7 +3416,7 @@ module OneM2M_Testcases_CSE_Release_2 {
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
f_send(e_mca_port, f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)))));
f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
tc_ac.start;
alt {
......@@ -3500,7 +3500,7 @@ module OneM2M_Testcases_CSE_Release_2 {
// Test Body
vc_ae2.start(f_cse_notifyProcedure_noNotificationHandler()); // check that no notification is received
f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
......@@ -3733,7 +3733,7 @@ module OneM2M_Testcases_CSE_Release_2 {
// Test Body
vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_request)));
f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
......@@ -3820,7 +3820,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_deleteRequest:= valueof(m_delete(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex))); // Ae delete request
f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_deleteRequest)));
f_send(e_mca_port, m_request(v_deleteRequest));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
......@@ -3904,7 +3904,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_deleteRequest := valueof(m_delete(f_getResourceAddress(v_containerResourceIndex), f_getOriginator(v_containerResourceIndex)));// Container deletion request
f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_deleteRequest)));
f_send(e_mca_port, m_request(v_deleteRequest));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
......@@ -4027,7 +4027,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
v_req1 := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_req1)));
f_send(e_mca_port, m_request(v_req1));
v_req2 := valueof(m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentNotification_subscriptionVerification(PX_CSE1_ID)));
......@@ -4066,7 +4066,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_resp2.requestIdentifier := v_resp1.primitive.responsePrimitive.primitiveContent.requestPrimitive.requestIdentifier;//requestIdentifier of req2
v_req3 := valueof(m_notifyResponsePrimitive(f_getResourceAddress(v_resourceIndex) & "/" & c_resourceShortNamePollingChannelUri, v_resp2));
v_req3.from_ := f_getOriginator(v_aeIndex);
f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_req3)));
f_send(e_mca_port, m_request(v_req3));
tc_ac.start;
alt {
......@@ -4141,7 +4141,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_req2.from_ := PX_CSE1_ID;
v_req1 := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_req1)));
f_send(e_mca_port, m_request(v_req1));
tc_ac.start;
alt {
......@@ -4174,7 +4174,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_resp2.requestIdentifier := v_resp1.primitive.responsePrimitive.primitiveContent.requestPrimitive.requestIdentifier;//requestIdentifier of req2
v_req3 := valueof(m_notifyResponsePrimitive(f_getResourceAddress(v_resourceIndex) & "/" & c_resourceShortNamePollingChannelUri, v_resp2));
v_req3.from_ := f_getOriginator(v_aeIndex);
f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_req3)));
f_send(e_mca_port, m_request(v_req3));
tc_ac.start;
alt {
......@@ -4244,7 +4244,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
v_req1 := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_req1)));
f_send(e_mca_port, m_request(v_req1));
v_req2 := valueof(m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentNotification_subscriptionVerification(PX_CSE1_ID)));
......@@ -4281,7 +4281,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_resp2.requestIdentifier := v_resp1.primitive.responsePrimitive.primitiveContent.requestPrimitive.requestIdentifier;
v_req3 := valueof(m_notifyResponsePrimitive(f_getResourceAddress(v_resourceIndex) & "/" & c_resourceShortNamePollingChannelUri, v_resp2));
v_req3.from_ := f_getOriginator(v_aeIndex);
f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_req3)));
f_send(e_mca_port, m_request(v_req3));
tc_ac.start;
alt {
......@@ -4369,7 +4369,7 @@ module OneM2M_Testcases_CSE_Release_2 {
//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 };
f_send(e_mcc_in_port, f_getMsgOutPrimitive(m_response(v_response_rsp1)));
f_send(e_mcc_in_port, m_response(v_response_rsp1));
}
[] tc_ac.timeout {
setverdict(inconc, __SCOPE__&":INFO: No request received for creating resource type Polling Channel");
......@@ -4472,7 +4472,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_req1 := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
v_req1.requestExpirationTimestamp := { alt_1 := 10000};
f_send(e_mca_port, f_getMsgOutPrimitive(m_request(v_req1)));
f_send(e_mca_port, m_request(v_req1));
tc_ac.start;
alt {
......
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