Commit f02e838f 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 6f0683c0 16962d12
......@@ -4299,7 +4299,7 @@ module OneM2M_Functions {
group CseSimuFunctions {
function f_ae_createPollingChannel(template UtTriggerPrimitive p_utRequest := m_utCreateAe) runs on CseSimu return integer {
function f_ae_createPollingChannel(template UtTriggerPrimitive p_utRequest := m_utCreateAe, integer p_parentIndex := vc_cSEBaseIndex) runs on CseSimu return integer {
var MsgIn v_request;
var PrimitiveContent v_modifiedResource;
var integer v_resourceIndex, v_parentIndex;
......@@ -4310,6 +4310,8 @@ module OneM2M_Functions {
p_utRequest.requestPrimitive.primitiveContent.pollingChannel := m_contentCreatePollingChannel;
}
p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(p_parentIndex);
f_ae_sendUtPrimitive(p_utRequest, v_action);
tc_ac.start;
......
......@@ -6760,6 +6760,12 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
v_request.resultContent := int0;//Nothing
if(valueof(p_childResourceType) == int23) {
if (vc_ae2.running) {
vc_ae2.stop;
}
vc_ae2.start(f_cse_notifyProcedure_defaultHandler());
}
f_send(e_mcaPort, m_request(v_request));
tc_ac.start;
alt {
......@@ -6833,6 +6839,12 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
v_request.resultContent := int1;//Attributes
if(valueof(p_childResourceType) == int23) {
if (vc_ae2.running) {
vc_ae2.stop;
}
vc_ae2.start(f_cse_notifyProcedure_defaultHandler());
}
f_send(e_mcaPort, m_request(v_request));
tc_ac.start;
alt {
......@@ -6906,6 +6918,12 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
v_request.resultContent := int9;//Modified Attributes
if(valueof(p_childResourceType) == int23) {
if (vc_ae2.running) {
vc_ae2.stop;
}
vc_ae2.start(f_cse_notifyProcedure_defaultHandler());
}
f_send(e_mcaPort, m_request(v_request));
tc_ac.start;
alt {
......@@ -8096,7 +8114,7 @@ module OneM2M_PermutationFunctions {
} // end f_CSE_GMG_004
function f_CSE_GMG_005(template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu system CseSystem {
function f_CSE_GMG_005(template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse := omit) runs on AeSimu system CseSystem {
//Local constants
const integer c_numberOfResponsePrimitive := 2;
......@@ -8187,7 +8205,7 @@ module OneM2M_PermutationFunctions {
} // end f_CSE_GMG_005
function f_CSE_GMG_006(template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu system CseSystem {
function f_CSE_GMG_006(template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse := omit) runs on AeSimu system CseSystem {
//Local constants
const integer c_numberOfResponsePrimitive := 2;
......
......@@ -2114,7 +2114,7 @@ module OneM2M_Testcases_AE_Release_1 {
f_checkCseSimuStatus();
//Create a function to receive the Create PollingChannel and to send the response
v_pollingChannelIndex := f_ae_createPollingChannel(v_utRequest2);
v_pollingChannelIndex := f_ae_createPollingChannel(v_utRequest2, v_aeIndex);
f_checkCseSimuStatus();
......
......@@ -12297,9 +12297,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_GMG_005_DEL() runs on Tester system CseSystem { //Delete
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.aE := mw_contentAeBase;// TODO see with wath should it be matched
v_ae1.start(f_CSE_GMG_005(m_delete("Temporary", "Temporary"), v_contentResponse));
v_ae1.start(f_CSE_GMG_005(m_delete("Temporary", "Temporary")));
v_ae1.done;
}//end TC_CSE_GMG_005_DEL
......@@ -12347,10 +12345,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_GMG_006_DEL() runs on Tester system CseSystem { //Delete
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.container := mw_contentContainerBase;// TODO see with wath should it be matched
v_ae1.start(f_CSE_GMG_006(m_delete("Temporary", "Temporary"), v_contentResponse));
v_ae1.start(f_CSE_GMG_006(m_delete("Temporary", "Temporary")));
v_ae1.done;
}//end TC_CSE_GMG_006_DEL
......
......@@ -1999,27 +1999,30 @@ module OneM2M_Testcases_CSE_Release_2 {
var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
var template PrimitiveContent v_contentResponse;
v_contentResponse.container := mw_contentContainer_allOmit;
v_contentResponse.container := mw_contentContainer_allOmit;
v_contentResponse.container.lastModifiedTime := ?;
v_contentResponse.container.stateTag := ?;
v_contentResponse.container.labels := ?;
v_updateRequest.primitiveContent.container.labels := {"VALUE_1"};
v_ae1.start(f_CSE_DMR_UPD_022(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase, v_updateRequest));//Container
v_ae1.done;
}
}
testcase TC_CSE_DMR_UPD_022_GRP() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var RequestPrimitive v_updateRequest := valueof(m_updateGroupBase);
var template PrimitiveContent v_contentResponse;
v_contentResponse.group_ := mw_contentGroup_allOmit;
v_contentResponse.group_ := mw_contentGroup_allOmit;
v_contentResponse.group_.lastModifiedTime := ?;
v_contentResponse.group_.labels := ?;
v_updateRequest.primitiveContent.group_.labels := {"VALUE_1"};
v_ae1.start(f_CSE_DMR_UPD_022(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase, v_updateRequest));//Group
v_ae1.done;
}
}
testcase TC_CSE_DMR_UPD_022_ACP() runs on Tester system CseSystem {
// Local variables
......@@ -2027,13 +2030,14 @@ module OneM2M_Testcases_CSE_Release_2 {
var RequestPrimitive v_updateRequest := valueof(m_updateAcpBase);
var template PrimitiveContent v_contentResponse;
v_contentResponse.accessControlPolicy := mw_contentAcp_allOmit;
v_contentResponse.accessControlPolicy := mw_contentAcp_allOmit;
v_contentResponse.accessControlPolicy.lastModifiedTime := ?;
v_contentResponse.accessControlPolicy.labels := ?;
v_updateRequest.primitiveContent.accessControlPolicy.labels := {"VALUE_1"};
v_ae1.start(f_CSE_DMR_UPD_022(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase, v_updateRequest));//AccessControlPolicy
v_ae1.done;
}
}
} // end g_CSE_DMR_UPD_022
......
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