Commit 870201a8 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega

Merge branch 'Release2' of https://git.onem2m.org/TST/ATS into Release2

parents 3f44c058 1d7558ae
......@@ -1062,20 +1062,22 @@ module OneM2M_Functions {
}
if(not(v_deregistrationPerformed)) {
//Deregistration by Registree (IUT) - Send trigger message for deregistration
v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(vc_localRemoteCseIndex);
f_sendUtPrimitive(v_utRequest, v_action & f_getLocalResourceAddress(vc_localRemoteCseIndex));
tc_ac.start;
alt {
[] mccPortIn.receive(mw_request(mw_delete(f_getLocalResourceAddress(vc_localRemoteCseIndex)))) -> value vc_request {
tc_ac.stop;
f_processDeleteRequestPrimitive(vc_request.primitive.requestPrimitive);
mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
log(__SCOPE__&": INFO: Deregistration performed successfully");
}
[] tc_ac.timeout {
log(__SCOPE__&": INFO: No deregistration performed");
if(vc_localRemoteCseIndex != -1) {
//Deregistration by Registree (IUT) - Send trigger message for deregistration
v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(vc_localRemoteCseIndex);
f_sendUtPrimitive(v_utRequest, v_action & f_getLocalResourceAddress(vc_localRemoteCseIndex));
tc_ac.start;
alt {
[] mccPortIn.receive(mw_request(mw_delete(f_getLocalResourceAddress(vc_localRemoteCseIndex)))) -> value vc_request {
tc_ac.stop;
f_processDeleteRequestPrimitive(vc_request.primitive.requestPrimitive);
mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
log(__SCOPE__&": INFO: Deregistration performed successfully");
}
[] tc_ac.timeout {
log(__SCOPE__&": INFO: No deregistration performed");
}
}
}
}
......
......@@ -435,7 +435,7 @@ module OneM2M_Templates {
sizeBelow := omit,
contentType_list := {},
attribute_list := {},
filterUsage := omit,
filterUsage := int1,
limit := omit,
semanticsFilter_list := {},
filterOperation := omit,
......
......@@ -10679,6 +10679,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var integer v_childResourceIndex := -1;
const ResourceType c_containerResourceType := int3;
var AttributeAux v_invalidAttribute;
var FilterCriteria v_invalidFilterCriteria;
// Test control
......@@ -10692,7 +10693,9 @@ module OneM2M_Testcases_CSE_Release_1 {
v_resourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_aeIndex);
v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex);
v_request := valueof(m_retrieveFilterUsageOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1));
v_invalidFilterCriteria := valueof(m_filterCriteria);
v_invalidFilterCriteria.sizeBelow := 1;//Whatever value, it will be overwritten by forceFields parameter
v_request := valueof(m_retrieveFilterCriteria(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), v_invalidFilterCriteria));
v_invalidAttribute := {name := "filterCriteria.sizeBelow", value_ := "-1"};
mcaPort.send(f_getMsgOutPrimitive(m_request(v_request, {v_invalidAttribute})));
tc_ac.start;
......
......@@ -1212,6 +1212,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_ae1.start(f_CSE_DMR_RET_020(int3, m_createContainerBase, int9));//ResultContent = 9 (modified attributes)
v_ae1.done;
}
} // end g_CSE_DMR_RET_020
group g_CSE_DMR_RET_021 {
......@@ -2345,8 +2346,8 @@ module OneM2M_Testcases_CSE_Release_2 {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var RateLimit v_rateLimit_1 := {0, omit};
var RateLimit v_rateLimit_2 := {1, omit};
var RateLimit v_rateLimit_1 := {0, "PT20M"};
var RateLimit v_rateLimit_2 := {1, "PT30M"};
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
......
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