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

Merge branch 'Release2-onwards' into Release3-onwards

Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parents 99071900 01c5afb3
......@@ -11749,6 +11749,7 @@ module OneM2M_PermutationFunctions {
if (ischosen(v_response.primitive.responsePrimitive.primitiveContent.uRI)){
v_contentResponseRequestResource.request := mw_contentRequestBase;
v_requestResourceURI := v_response.primitive.responsePrimitive.primitiveContent.uRI;
v_contentResponseRequestResource.request.primitiveContent := p_requestPrimitive.primitiveContent;
if (p_operation == int1){ //create
v_statusCode := int2001;
v_primitiveContent := f_getTemplateFromPrimitiveContent(p_requestPrimitive.primitiveContent);
......@@ -11760,8 +11761,7 @@ module OneM2M_PermutationFunctions {
v_primitiveContent := f_getTemplateFromPrimitiveContent(p_requestPrimitive.primitiveContent);
}else if (p_operation == int4){ //delete
v_statusCode := int2002;
v_primitiveContent.container := mw_contentContainer_rc1;
//v_primitiveContent := omit;
v_primitiveContent := omit;
}
f_send(e_mcaPort, m_request(m_retrieve(v_requestResourceURI, f_getOriginator(v_aeIndex))));
tc_ac.start;
......@@ -12185,7 +12185,7 @@ module OneM2M_PermutationFunctions {
f_cse_notifyProcedure_responsePrimitiveHandler(mw_responsePrimitive(p_responseStatusCode));
vc_ae2.done;
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
// Postamble
f_cse_postamble_deleteResources();
......
......@@ -2222,7 +2222,7 @@ module OneM2M_Testcases_CSE_Release_2 {
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4101))) -> value v_response { //SUBSCRIPTION_CREATOR_HAS_NO_PRIVILEGE
[] mcaPort.receive(mw_response(mw_responsePrimitive(int5204))) -> value v_response { //SUBSCRIPTION_VERIFICATION_INITIATION_FAILED
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": OK : Subscription creator has no privilege");
}
......@@ -2301,7 +2301,7 @@ module OneM2M_Testcases_CSE_Release_2 {
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int5205))) -> value v_response { //SUBSCRIPTION_CREATOR_HAS_NO_PRIVILEGE
[] mcaPort.receive(mw_response(mw_responsePrimitive(int5204))) -> value v_response { //SUBSCRIPTION_VERIFICATION_INITIATION_FAILED
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": OK : Subscription creator has no privilege");
}
......@@ -3042,7 +3042,7 @@ module OneM2M_Testcases_CSE_Release_2 {
// Test Body
v_contentResponse.aE.labels := v_labels_3;
vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
vc_ae2.start(f_cse_notifyProcedure_aggregatedNoficationHandler(v_contentResponse, 1)); // check if the notification is well received and if its content matchs
v_updateRequest.primitiveContent.aE.labels := v_labels_1;
f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // Update request 1
......
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