Overall cleanup and reordering

Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parent f105adea
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -1449,7 +1449,7 @@ module OneM2M_PermutationFunctions {
vc_remoteCseIndex := f_cse_registerRemoteCse(p_request, p_contentResponse);
//Check if the resource has been deleted or not
if(f_cse_isResourcePresent(vc_remoteCseIndex)) {
if(f_cse_isResourcePresent_cseSimu(vc_remoteCseIndex)) {
setverdict(pass, __SCOPE__ & ":INFO: Resource created");
} else {
setverdict(fail, __SCOPE__ & ":INFO: Resource not created");
......@@ -1821,7 +1821,7 @@ module OneM2M_PermutationFunctions {
f_checkAeSimuStatus();
//Check to see if the resource is present or not
if (f_isResourcePresent(v_resourceIndex)){
if (f_cse_isResourcePresent(v_resourceIndex)){
setverdict(pass, __SCOPE__ & ":INFO: Resource created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
......@@ -1897,7 +1897,7 @@ module OneM2M_PermutationFunctions {
f_checkCseSimuStatus();
//Check to see if the resource is present or not
if (f_cse_isResourcePresent(v_resourceIndex)){
if (f_cse_isResourcePresent_cseSimu(v_resourceIndex)){
setverdict(pass, __SCOPE__ & ":INFO: Resource created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
......@@ -1962,7 +1962,7 @@ module OneM2M_PermutationFunctions {
f_checkAeSimuStatus();
//Check to see if the resource is present or not
if(f_isResourcePresent(v_resourceIndex)){
if(f_cse_isResourcePresent(v_resourceIndex)){
setverdict(pass, __SCOPE__ & ":INFO: Resource created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
......@@ -2091,7 +2091,7 @@ module OneM2M_PermutationFunctions {
f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
if(f_cse_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
......@@ -2148,7 +2148,7 @@ module OneM2M_PermutationFunctions {
f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
if(f_cse_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
......@@ -2209,7 +2209,7 @@ module OneM2M_PermutationFunctions {
f_checkAeSimuStatus();
//Check to see if the resource is present or not
if(f_isResourcePresent(v_resourceIndex)){
if(f_cse_isResourcePresent(v_resourceIndex)){
setverdict(pass, __SCOPE__ & ":INFO: Resource created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
......@@ -2302,7 +2302,7 @@ module OneM2M_PermutationFunctions {
f_checkAeSimuStatus();
//Check to see if the resource is present or not
if(f_isResourcePresent(v_resourceIndex)) {
if(f_cse_isResourcePresent(v_resourceIndex)) {
setverdict(pass, __SCOPE__ & ":INFO: Resource created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
......@@ -2594,7 +2594,7 @@ module OneM2M_PermutationFunctions {
mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
vc_cse1.start(f_cse_receiveCreateRequest(p_requestAnnc));
vc_cse1.start(f_cse_receiveCreateRequest_cseSimu(p_requestAnnc));
vc_cse1.done;
// Postamble
......@@ -2644,7 +2644,7 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex);
vc_cse1.start(f_cse_receiveCreateRequest(p_requestAnnc));
vc_cse1.start(f_cse_receiveCreateRequest_cseSimu(p_requestAnnc));
mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
vc_cse1.done;
......@@ -4678,7 +4678,7 @@ module OneM2M_PermutationFunctions {
// Preamble
if(p_resourceType != int2) {
v_aeIndex := f_cse_preamble_registerAe(-, {f_getAnnouncementTargetPoA("HTTP", PX_AE1_ADDRESS, "")});//c_CRUDNDi);
v_aeIndex := f_cse_preamble_registerAe(-, {f_getCompletePoA("HTTP", PX_AE1_ADDRESS, "")});//c_CRUDNDi);
}
if(p_resourceType != int1) {
......@@ -4815,7 +4815,7 @@ module OneM2M_PermutationFunctions {
f_checkAeSimuStatus();
//Check to see if the resource is present or not
if (f_isResourceNotPresent(v_aeIndex, f_getResourceName(vc_resourcesList[v_resourceIndex].resource))){
if (f_cse_isResourceNotPresent(v_aeIndex, f_getResourceName(vc_resourcesList[v_resourceIndex].resource))){
setverdict(pass, __SCOPE__ & ":INFO: Resource deleted");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource not deleted");
......@@ -4903,7 +4903,7 @@ module OneM2M_PermutationFunctions {
f_checkAeSimuStatus();
//Check if the resource has been deleted or not
if(f_isResourcePresent(v_resourceIndex)) {
if(f_cse_isResourcePresent(v_resourceIndex)) {
setverdict(pass, __SCOPE__ & ":INFO: Resource not deleted");
} else {
setverdict(fail, __SCOPE__ & ":INFO: Resource deleted");
......@@ -6095,7 +6095,7 @@ module OneM2M_PermutationFunctions {
v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule};
vc_acpAuxIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)}, {f_getAnnouncementTargetPoA(-, PX_AE1_ADDRESS, -)});
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)}, {f_getCompletePoA(-, PX_AE1_ADDRESS, -)});
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
......@@ -6156,7 +6156,7 @@ module OneM2M_PermutationFunctions {
v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule};
vc_acpAuxIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)}, {f_getAnnouncementTargetPoA(-, PX_AE1_ADDRESS, -)});
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)}, {f_getCompletePoA(-, PX_AE1_ADDRESS, -)});
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
......
......@@ -700,17 +700,17 @@ module OneM2M_Testcases_CSE_Release_1 {
[] mccPortIn.receive(mw_request(v_requestPrimitive)) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": AE creation redirected.");
f_cse_sendResponse(v_request);
f_cse_sendResponse_cseSimu(v_request);
}
[] mccPortIn.receive(mw_request(mw_createAEAnnc())) -> value v_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": AE creation redirected but wrong parameters");
f_cse_sendResponse(v_request);
f_cse_sendResponse_cseSimu(v_request);
}
[] mccPortIn.receive(mw_request(?))-> value v_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Unexpected message received");
f_cse_sendResponse(v_request);
f_cse_sendResponse_cseSimu(v_request);
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while creating AE");
......@@ -1712,7 +1712,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
//Check to see if the resource is present or not
if (f_isResourcePresent(vc_aeAuxIndex)){
if (f_cse_isResourcePresent(vc_aeAuxIndex)){
setverdict(pass, __SCOPE__ & ":INFO: Resource created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
......@@ -2062,7 +2062,7 @@ module OneM2M_Testcases_CSE_Release_1 {
vc_remoteCseIndex := f_cse_registerRemoteCse(v_request, v_contentResponse);
//Check if the resource has been deleted or not
if(f_cse_isResourcePresent(vc_remoteCseIndex)) {
if(f_cse_isResourcePresent_cseSimu(vc_remoteCseIndex)) {
setverdict(pass, __SCOPE__ & ":INFO: Resource created");
} else {
setverdict(fail, __SCOPE__ & ":INFO: Resource not created");
......@@ -3164,7 +3164,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
// Check if the resource has been deleted or not
if(f_cse_isResourcePresent(vc_remoteCseIndex)) {
if(f_cse_isResourcePresent_cseSimu(vc_remoteCseIndex)) {
setverdict(fail, __SCOPE__ & ":INFO: Resource not deleted");
} else {
setverdict(pass, __SCOPE__ & ":INFO: Resource deleted");
......@@ -4025,7 +4025,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_containerIndex, c_defaultContentInstanceResourceName)){
if(f_cse_isResourceNotPresent(v_containerIndex, c_defaultContentInstanceResourceName)){
setverdict(pass, __SCOPE__ & ":INFO: Oldest contentInstance has been removed to allow the creation of the new contentInstance");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Oldest contentInstance has not been removed to allow the creation of the new contentInstance");
......@@ -4112,7 +4112,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_containerIndex, c_defaultContentInstanceResourceName)){
if(f_cse_isResourceNotPresent(v_containerIndex, c_defaultContentInstanceResourceName)){
setverdict(pass, __SCOPE__ & ":INFO: Oldest contentInstance has been removed to allow the creation of the new contentInstance");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Oldest contentInstance has not been removed to allow the creation of the new contentInstance");
......@@ -4272,7 +4272,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_containerIndex, f_getResourceName(v_request.primitiveContent))){
if(f_cse_isResourceNotPresent(v_containerIndex, f_getResourceName(v_request.primitiveContent))){
setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
......@@ -4352,7 +4352,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_containerIndex, f_getResourceName(v_request.primitiveContent))){
if(f_cse_isResourceNotPresent(v_containerIndex, f_getResourceName(v_request.primitiveContent))){
setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
......@@ -5839,7 +5839,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_ae1.done;
v_createRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;//Attribute 3
v_updateRequest.primitiveContent.accessControlPolicy.privileges := v_privileges_2; //Attribute 1
v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {f_getAnnouncementTargetPoA()};//Attribute 2
v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {f_getCompletePoA()};//Attribute 2
v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_2;//Attribute 3
v_nullFields := {{"labels", omit}};
......@@ -8689,7 +8689,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_resourceIndex, f_getResourceName(v_request.primitiveContent))){
if(f_cse_isResourceNotPresent(v_resourceIndex, f_getResourceName(v_request.primitiveContent))){
setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
......@@ -8764,7 +8764,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_contentInstanceResourceIndex, f_getResourceName(v_request.primitiveContent))){
if(f_cse_isResourceNotPresent(v_contentInstanceResourceIndex, f_getResourceName(v_request.primitiveContent))){
setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
......@@ -8844,7 +8844,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
if(f_cse_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
......@@ -8918,7 +8918,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
if(f_cse_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
......@@ -9343,7 +9343,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_checkAeSimuStatus();
//Check to see if the resource is present or not
if(f_isResourcePresent(v_acpIndex)) {
if(f_cse_isResourcePresent(v_acpIndex)) {
setverdict(pass, __SCOPE__ & ":INFO: Resource created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
......@@ -9428,7 +9428,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_checkAeSimuStatus();
//Check to see if the resource is present or not
if(f_isResourcePresent(v_acpIndex)) {
if(f_cse_isResourcePresent(v_acpIndex)) {
setverdict(pass, __SCOPE__ & ":INFO: Resource created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
......@@ -9513,7 +9513,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_checkAeSimuStatus();
//Check to see if the resource is present or not
if(f_isResourcePresent(v_acpIndex)) {
if(f_cse_isResourcePresent(v_acpIndex)) {
setverdict(pass, __SCOPE__ & ":INFO: Resource created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
......@@ -9588,7 +9588,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_checkAeSimuStatus();
//Check to see if the resource is present or not
if(f_isResourceNotPresent(-1, v_createRequest.primitiveContent.accessControlPolicy.resourceName)) {
if(f_cse_isResourceNotPresent(-1, v_createRequest.primitiveContent.accessControlPolicy.resourceName)) {
setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
......@@ -11099,7 +11099,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
if(f_cse_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
......@@ -11187,7 +11187,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
if(f_cse_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
......
......@@ -3671,7 +3671,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_ae1.done;
v_createRequest.primitiveContent.schedule.scheduleElement := {{"0 0 0,1,2 1 1 *"}};//Attribute 1
v_updateRequest.primitiveContent.schedule.scheduleElement := {{"1 1 1,2 1 1 *"}}; //Attribute 1
v_updateRequest.primitiveContent.schedule.announceTo := {f_getAnnouncementTargetPoA()};//Attribute 2
v_updateRequest.primitiveContent.schedule.announceTo := {f_getCompletePoA()};//Attribute 2
v_updateRequest.primitiveContent.schedule.labels := v_labels_1;//Attribute 3
v_nullFields := {{"labels", omit}};
......@@ -5485,7 +5485,7 @@ module OneM2M_Testcases_CSE_Release_2 {
f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
if(f_cse_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
......@@ -5560,7 +5560,7 @@ module OneM2M_Testcases_CSE_Release_2 {
f_checkAeSimuStatus();
//Check to see if the resource is present or not
if(f_isResourcePresent(v_resourceIndex)) {
if(f_cse_isResourcePresent(v_resourceIndex)) {
setverdict(pass, __SCOPE__ & ":INFO: Resource created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
......@@ -5643,7 +5643,7 @@ module OneM2M_Testcases_CSE_Release_2 {
f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
if(f_cse_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
......@@ -5716,7 +5716,7 @@ module OneM2M_Testcases_CSE_Release_2 {
f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
if(f_cse_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
......@@ -5948,7 +5948,7 @@ module OneM2M_Testcases_CSE_Release_2 {
f_checkAeSimuStatus();
//Check to see if the resource is present or not
if(f_isResourcePresent(v_resourceIndex)) {
if(f_cse_isResourcePresent(v_resourceIndex)) {
setverdict(pass, __SCOPE__ & ":INFO: Resource created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
......@@ -6027,7 +6027,7 @@ module OneM2M_Testcases_CSE_Release_2 {
f_checkAeSimuStatus();
//Check to see if the resource is present or not
if(f_isResourcePresent(v_resourceIndex)) {
if(f_cse_isResourcePresent(v_resourceIndex)) {
setverdict(pass, __SCOPE__ & ":INFO: Resource created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
......@@ -6502,7 +6502,7 @@ module OneM2M_Testcases_CSE_Release_2 {
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
if(f_cse_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
......@@ -6579,7 +6579,7 @@ module OneM2M_Testcases_CSE_Release_2 {
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
if(f_cse_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
......
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