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

Merge branch 'master' into oneM2M_Interop06_modifications

Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parents 38fd5e05 c7dbe726
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -30,7 +30,18 @@ module OneM2M_Testcases_CSE_Release_1 {
group helpingTestCases {//These are not part of the test suite, just for verification purposes
testcase TC_DELETE_RESOURCES() runs on AeSimu system CseSystem {
testcase TC_DELETE_RESOURCES() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_ae1.start(f_DELETE_RESOURCES());
v_ae1.done;
}
function f_DELETE_RESOURCES() runs on AeSimu system CseSystem {
timer t_ac := 5.0;
var integer i;
......@@ -694,7 +705,7 @@ module OneM2M_Testcases_CSE_Release_1 {
vc_ae1.start(f_cse_sendCreateRequestPrimitive(int2, m_createAe(PX_APP_ID, -, "S", omit)));
vc_ae1.done;
v_requestPrimitive := mw_createAEAnnc(PX_CSE_ID & "/S", -, -, -);
v_requestPrimitive := mw_createAEAnnc_s_ae_id(PX_CSE_ID & "/S", -, -, -);
v_requestPrimitive.primitiveContent.aEAnnc.app_ID := PX_APP_ID;
tc_ac.start;
......@@ -773,7 +784,7 @@ module OneM2M_Testcases_CSE_Release_1 {
tc_ac.start;
alt {
[] mccPortIn.receive(mw_request(mw_createAEAnnc(PX_CSE_ID, f_getLocalResourceAddress(vc_cSEBaseIndex), -))) {
[] mccPortIn.receive(mw_request(mw_createAEAnnc_s_ae_id(PX_CSE_ID, f_getLocalResourceAddress(vc_cSEBaseIndex), -))) {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": AE creation redirected.");
}
......@@ -908,11 +919,11 @@ module OneM2M_Testcases_CSE_Release_1 {
tc_ac.start;
alt {
[] mccPortIn.receive(mw_request(mw_createAEAnnc(f_getResourceAddress(-1,e_hierarchical, e_spRelative) & "/S", "CSE_ID", -))) {
[] mccPortIn.receive(mw_request(mw_createAEAnnc_s_ae_id(f_getResourceAddress(-1,e_hierarchical, e_spRelative) & "/S", "CSE_ID", -))) {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": AE creation redirected.");
}
[] mccPortIn.receive(mw_request(mw_createAEAnnc(f_getResourceAddress(-1,e_hierarchical, e_absolute) & "/S", "CSE_ID", -))) {
[] mccPortIn.receive(mw_request(mw_createAEAnnc_s_ae_id(f_getResourceAddress(-1,e_hierarchical, e_absolute) & "/S", "CSE_ID", -))) {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": AE creation redirected.");
}
......@@ -1061,7 +1072,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Test Body
f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, f_getResourceId(vc_resourcesList[v_aeIndex].resource)));
vc_cse1.start(f_cse_announcementProcedure_createHandler(mw_createAEAnnc(PX_CSE_ID, -, -, -)));
vc_cse1.start(f_cse_announcementProcedure_createHandler(mw_createAEAnnc_s_ae_id(PX_CSE_ID, -, -, -)));
vc_cse1.done;
tc_ac.start;
......
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