Fix #27 as proposed

Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parent a3627660
...@@ -1174,6 +1174,8 @@ module OneM2M_Functions { ...@@ -1174,6 +1174,8 @@ module OneM2M_Functions {
v_request := valueof(m_updateAcpBase); v_request := valueof(m_updateAcpBase);
v_request.requestIdentifier := valueof(v_request.requestIdentifier) & f_rnd(1, 1000000);
v_request.to_ := f_getResourceAddress(vc_acpAuxIndex); v_request.to_ := f_getResourceAddress(vc_acpAuxIndex);
v_request.from_ := f_getOriginator(vc_acpAuxIndex); v_request.from_ := f_getOriginator(vc_acpAuxIndex);
v_request.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {valueof(m_createAcr(PX_ACOR, p_allowedOperations))}; v_request.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {valueof(m_createAcr(PX_ACOR, p_allowedOperations))};
......
...@@ -5905,6 +5905,9 @@ module OneM2M_PermutationFunctions { ...@@ -5905,6 +5905,9 @@ module OneM2M_PermutationFunctions {
[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response { [] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
tc_ac.stop; tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Successful operation on resource type int2 (Ae)"); setverdict(pass, __SCOPE__ & ": Successful operation on resource type int2 (Ae)");
if(p_responseStatusCode == int2002) {
f_removeElementFromList(vc_resourcesIndexToBeDeleted, v_aeIndex);
}
} }
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop; tc_ac.stop;
...@@ -5980,6 +5983,9 @@ module OneM2M_PermutationFunctions { ...@@ -5980,6 +5983,9 @@ module OneM2M_PermutationFunctions {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop; tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error operation have been accpeted without having privileges"); setverdict(fail, __SCOPE__ & ": Error operation have been accpeted without having privileges");
if(p_responseStatusCode == int2002) {
f_removeElementFromList(vc_resourcesIndexToBeDeleted, v_aeIndex);
}
} }
[] tc_ac.timeout { [] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while executing operation"); setverdict(fail, __SCOPE__ & ": No answer while executing operation");
...@@ -6117,7 +6123,6 @@ module OneM2M_PermutationFunctions { ...@@ -6117,7 +6123,6 @@ module OneM2M_PermutationFunctions {
// Local variables // Local variables
var MsgIn v_response; var MsgIn v_response;
var integer v_aeIndex := -1; var integer v_aeIndex := -1;
var integer v_acpIndex := -1;
var RequestPrimitive v_createRequest; var RequestPrimitive v_createRequest;
var AccessControlRule v_accessControlRule := valueof(m_createAcr({"all"}, int63)); var AccessControlRule v_accessControlRule := valueof(m_createAcr({"all"}, int63));
...@@ -6132,9 +6137,9 @@ module OneM2M_PermutationFunctions { ...@@ -6132,9 +6137,9 @@ module OneM2M_PermutationFunctions {
v_createRequest := f_getCreateRequestPrimitive(int1, m_createAcpBase, -1); v_createRequest := f_getCreateRequestPrimitive(int1, m_createAcpBase, -1);
v_accessControlRule.accessControlContexts_list := {{{}, {{f_getIpv4Address(PX_AE1_ADDRESS)}, omit}, omit}}; v_accessControlRule.accessControlContexts_list := {{{}, {{f_getIpv4Address(PX_AE1_ADDRESS)}, omit}, omit}};
v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule}; v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule};
v_acpIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource vc_acpAuxIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpIndex].resource)}, {f_getAnnouncementTargetPoA(-, PX_AE1_ADDRESS, -)}); v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)}, {f_getAnnouncementTargetPoA(-, PX_AE1_ADDRESS, -)});
// Test Body // Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex); p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
...@@ -6147,6 +6152,9 @@ module OneM2M_PermutationFunctions { ...@@ -6147,6 +6152,9 @@ module OneM2M_PermutationFunctions {
[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response { [] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
tc_ac.stop; tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Successful operation on resource type int2 (Ae)"); setverdict(pass, __SCOPE__ & ": Successful operation on resource type int2 (Ae)");
if(p_responseStatusCode == int2002) {
f_removeElementFromList(vc_resourcesIndexToBeDeleted, v_aeIndex);
}
} }
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop; tc_ac.stop;
...@@ -6163,6 +6171,8 @@ module OneM2M_PermutationFunctions { ...@@ -6163,6 +6171,8 @@ module OneM2M_PermutationFunctions {
//Postamble //Postamble
f_cse_updateAcpAuxResource(int63);
f_cse_postamble_deleteResources(); f_cse_postamble_deleteResources();
//Tear down //Tear down
...@@ -6174,7 +6184,6 @@ module OneM2M_PermutationFunctions { ...@@ -6174,7 +6184,6 @@ module OneM2M_PermutationFunctions {
// Local variables // Local variables
var MsgIn v_response; var MsgIn v_response;
var integer v_aeIndex := -1; var integer v_aeIndex := -1;
var integer v_acpIndex := -1;
var RequestPrimitive v_createRequest; var RequestPrimitive v_createRequest;
var AccessControlRule v_accessControlRule := valueof(m_createAcr({"all"}, int63)); var AccessControlRule v_accessControlRule := valueof(m_createAcr({"all"}, int63));
...@@ -6187,11 +6196,11 @@ module OneM2M_PermutationFunctions { ...@@ -6187,11 +6196,11 @@ module OneM2M_PermutationFunctions {
// Preamble // Preamble
v_createRequest := f_getCreateRequestPrimitive(int1, m_createAcpBase, -1); v_createRequest := f_getCreateRequestPrimitive(int1, m_createAcpBase, -1);
v_accessControlRule.accessControlContexts_list := {{{}, {{f_getIpv4Address(PX_AE2_ADDRESS)}, omit}, omit}}; v_accessControlRule.accessControlContexts_list := {{{}, {{"240.0.0.0"}, omit}, omit}};
v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule}; v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule};
v_acpIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource vc_acpAuxIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpIndex].resource)}, {f_getAnnouncementTargetPoA(-, PX_AE1_ADDRESS, -)}); v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)}, {f_getAnnouncementTargetPoA(-, PX_AE1_ADDRESS, -)});
// Test Body // Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex); p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
...@@ -6212,6 +6221,9 @@ module OneM2M_PermutationFunctions { ...@@ -6212,6 +6221,9 @@ module OneM2M_PermutationFunctions {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop; tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error operation have been accpeted without having privileges"); setverdict(fail, __SCOPE__ & ": Error operation have been accpeted without having privileges");
if(p_responseStatusCode == int2002) {
f_removeElementFromList(vc_resourcesIndexToBeDeleted, v_aeIndex);
}
} }
[] tc_ac.timeout { [] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while executing operation"); setverdict(fail, __SCOPE__ & ": No answer while executing operation");
...@@ -6220,6 +6232,8 @@ module OneM2M_PermutationFunctions { ...@@ -6220,6 +6232,8 @@ module OneM2M_PermutationFunctions {
//Postamble //Postamble
f_cse_updateAcpAuxResource(int63);
f_cse_postamble_deleteResources(); f_cse_postamble_deleteResources();
//Tear down //Tear down
......
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