Commit 870201a8f1de685baa3cc4a7846a233ab8e0bd73

Authored by Miguel Angel Reina Ortega
2 parents 3f44c058 1d7558ae

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

... ... @@ -1062,20 +1062,22 @@ module OneM2M_Functions {
1062 1062 }
1063 1063  
1064 1064 if(not(v_deregistrationPerformed)) {
1065   - //Deregistration by Registree (IUT) - Send trigger message for deregistration
1066   - v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(vc_localRemoteCseIndex);
1067   - f_sendUtPrimitive(v_utRequest, v_action & f_getLocalResourceAddress(vc_localRemoteCseIndex));
1068   -
1069   - tc_ac.start;
1070   - alt {
1071   - [] mccPortIn.receive(mw_request(mw_delete(f_getLocalResourceAddress(vc_localRemoteCseIndex)))) -> value vc_request {
1072   - tc_ac.stop;
1073   - f_processDeleteRequestPrimitive(vc_request.primitive.requestPrimitive);
1074   - mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
1075   - log(__SCOPE__&": INFO: Deregistration performed successfully");
1076   - }
1077   - [] tc_ac.timeout {
1078   - log(__SCOPE__&": INFO: No deregistration performed");
  1065 + if(vc_localRemoteCseIndex != -1) {
  1066 + //Deregistration by Registree (IUT) - Send trigger message for deregistration
  1067 + v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(vc_localRemoteCseIndex);
  1068 + f_sendUtPrimitive(v_utRequest, v_action & f_getLocalResourceAddress(vc_localRemoteCseIndex));
  1069 +
  1070 + tc_ac.start;
  1071 + alt {
  1072 + [] mccPortIn.receive(mw_request(mw_delete(f_getLocalResourceAddress(vc_localRemoteCseIndex)))) -> value vc_request {
  1073 + tc_ac.stop;
  1074 + f_processDeleteRequestPrimitive(vc_request.primitive.requestPrimitive);
  1075 + mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
  1076 + log(__SCOPE__&": INFO: Deregistration performed successfully");
  1077 + }
  1078 + [] tc_ac.timeout {
  1079 + log(__SCOPE__&": INFO: No deregistration performed");
  1080 + }
1079 1081 }
1080 1082 }
1081 1083 }
... ...
... ... @@ -435,7 +435,7 @@ module OneM2M_Templates {
435 435 sizeBelow := omit,
436 436 contentType_list := {},
437 437 attribute_list := {},
438   - filterUsage := omit,
  438 + filterUsage := int1,
439 439 limit := omit,
440 440 semanticsFilter_list := {},
441 441 filterOperation := omit,
... ...
... ... @@ -10679,6 +10679,7 @@ module OneM2M_Testcases_CSE_Release_1 {
10679 10679 var integer v_childResourceIndex := -1;
10680 10680 const ResourceType c_containerResourceType := int3;
10681 10681 var AttributeAux v_invalidAttribute;
  10682 + var FilterCriteria v_invalidFilterCriteria;
10682 10683  
10683 10684 // Test control
10684 10685  
... ... @@ -10692,7 +10693,9 @@ module OneM2M_Testcases_CSE_Release_1 {
10692 10693  
10693 10694 v_resourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_aeIndex);
10694 10695 v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex);
10695   - v_request := valueof(m_retrieveFilterUsageOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1));
  10696 + v_invalidFilterCriteria := valueof(m_filterCriteria);
  10697 + v_invalidFilterCriteria.sizeBelow := 1;//Whatever value, it will be overwritten by forceFields parameter
  10698 + v_request := valueof(m_retrieveFilterCriteria(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), v_invalidFilterCriteria));
10696 10699 v_invalidAttribute := {name := "filterCriteria.sizeBelow", value_ := "-1"};
10697 10700 mcaPort.send(f_getMsgOutPrimitive(m_request(v_request, {v_invalidAttribute})));
10698 10701 tc_ac.start;
... ...
... ... @@ -1212,6 +1212,7 @@ module OneM2M_Testcases_CSE_Release_2 {
1212 1212 v_ae1.start(f_CSE_DMR_RET_020(int3, m_createContainerBase, int9));//ResultContent = 9 (modified attributes)
1213 1213 v_ae1.done;
1214 1214 }
  1215 +
1215 1216 } // end g_CSE_DMR_RET_020
1216 1217  
1217 1218 group g_CSE_DMR_RET_021 {
... ... @@ -2345,8 +2346,8 @@ module OneM2M_Testcases_CSE_Release_2 {
2345 2346 // Local variables
2346 2347 var AeSimu v_ae1 := AeSimu.create("AE1") alive;
2347 2348  
2348   - var RateLimit v_rateLimit_1 := {0, omit};
2349   - var RateLimit v_rateLimit_2 := {1, omit};
  2349 + var RateLimit v_rateLimit_1 := {0, "PT20M"};
  2350 + var RateLimit v_rateLimit_2 := {1, "PT30M"};
2350 2351 var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
2351 2352 var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
2352 2353 var ResponsePrimitive v_responsePrimitive;
... ...