diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 755bb0028aa066fde9e90aa5b3fd59303ec54400..4036355892e67188619d52d0e39712efe5adedc4 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -1835,33 +1835,6 @@ module OneM2M_Functions {
}
}
-
-
- function f_cse_generateMissingDataPoint(in integer p_timeSeriesResourceIndex) runs on AeSimu{
-
- var RequestPrimitive v_request;
- var integer v_resourceIndex := -1;
- var integer i;
- var XSD.NonNegativeInteger v_periodicInterval := vc_resourcesList[p_timeSeriesResourceIndex].resource.timeSeries.periodicInterval;
- var XSD.NonNegativeInteger v_missingDataDetectTimer := vc_resourcesList[p_timeSeriesResourceIndex].resource.timeSeries.missingDataDetectTimer;
- timer t_noAction;
-
- //Activate defaults when running on a PTC
- f_cse_activateDefaults_ae();
- i := 0;
- while (i < 3) {
- v_request := f_getCreateRequestPrimitive(int30, m_createTimeSeriesInstanceBase, p_timeSeriesResourceIndex);
- v_request.primitiveContent.timeSeriesInstance.resourceName := "MyTimeSeriesInstance" & int2str(i);
-
- v_resourceIndex := f_cse_createResource(int30, v_request, p_timeSeriesResourceIndex);
- i := i + 1;
- t_noAction.start(int2float(v_periodicInterval));
- }
-
- //After missingDataTimerDetect, a missing data point should have been detected
- t_noAction.start(int2float(v_missingDataDetectTimer));
-
- }
}//end group AeSimu
@@ -4333,14 +4306,6 @@ module OneM2M_Functions {
p_request.primitiveContent.subscription.accessControlPolicyIDs := {f_getResourceAddress(vc_acpIndex)};
}
}
- } else if (p_resourceType == int4) {//contentInstance
- } else if (p_resourceType == int30) {//timeSeriesInstance
- //dataGenerationTime
- if(ispresent(p_request.primitiveContent.timeSeriesInstance.dataGenerationTime)) {
- if(match(valueof(p_request.primitiveContent.timeSeriesInstance.dataGenerationTime), {alt_ := "29991231T000000"} )){
- p_request.primitiveContent.timeSeriesInstance.dataGenerationTime := {alt_ := fx_generateTimestamp()};
- }
- }
}
return valueof(p_request);
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 8f4d6cd2733ede3e689f27eaee6751dab646f165..b76dc6e3db61970b65f15ffa7003266734996f63 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -3674,164 +3674,6 @@ module OneM2M_PermutationFunctions {
}//end f_CSE_DMR_CRE_020
- function f_CSE_DMR_CRE_021(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on CseSimu system CseSystem {
-
- // Local variables
- var MsgIn v_response;
- var RequestPrimitive v_request;
- var integer v_parentIndex := -1;
- var integer v_resourceIndex := -1;
- var integer v_aEAnncIndex := -1;
-
- // Test control
-
- // Test component configuration
- f_cf04Up();
-
- // Test adapter configuration
-
- // Preamble
- vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
-
- v_aEAnncIndex := f_cse_createResource_cseSimu(int10002, m_createAEAnnc(omit, omit, omit, PX_TS_CSE1.cseId, PX_TS_CSE1.cseId), vc_remoteCseIndex); //AEAnnnc under RemoteCSE
-
- // Test Body
-
- v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aEAnncIndex);
-
- f_send(e_mcc_port, m_request(v_request));
- tc_ac.start;
- alt {
- [] mccPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response {
- tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(p_resourceType)) & " created successfully");
- f_checkAttributesToBeSaved(p_resourceType, v_request, vc_response.primitive.responsePrimitive);
- v_resourceIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_aEAnncIndex);
- }
- [] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Wrong response status code");
- }
- [] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Error while creating resource type " & int2str(enum2int(p_resourceType)));
- }
- [] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ": No answer while creating resource type " & int2str(enum2int(p_resourceType)));
- }
- }
-
- f_checkCseSimuStatus();
-
- //Check to see if the resource is present or not
- if (f_cse_isResourcePresent_cseSimu(v_resourceIndex)){
- setverdict(pass, __SCOPE__ & ":INFO: Resource created");
- } else {
- setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
- }
-
- // Postamble
- f_cse_postamble_deleteResourcesCSE();
-
- // Tear down
- f_cf04Down();
-
- }//end f_CSE_DMR_CRE_021
-
- function f_CSE_DMR_CRE_022(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template (present) RequestPrimitive p_requestAnnc) runs on AeSimu system CseSystem {
-
- // Local variables
- var MsgIn v_response;
- var RequestPrimitive v_request;
- var integer v_parentIndex := -1;
- var integer v_containerIndex := -1;
-
- // Test control
-
- // Test component configuration
- f_cf02Up();
-
- // Test adapter configuration
-
- // Preamble
- v_parentIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-
- if(p_resourceType == int4) {
- v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_parentIndex);
- v_parentIndex := v_containerIndex;
- }
-
- // Test Body
- v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex);
-
- f_send(e_mca_port, m_request(v_request));
-
- vc_cse1.start(f_cse_receiveCreateRequest_cseSimu(p_requestAnnc));
- f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
-
- // Postamble
- f_cse_postamble_deleteResources();
-
- // Tear down
- f_cf02Down();
-
- }//end f_CSE_DMR_CRE_022
-
- function f_CSE_DMR_CRE_023(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template (present) RequestPrimitive p_requestAnnc) runs on AeSimu system CseSystem{
-
- // Local variables
- var MsgIn v_anncRequest;
- var RequestPrimitive v_request;
- var integer v_parentIndex := -1;
- var integer v_containerIndex := -1;
- var integer v_remoteCseIndex;
- var integer v_aeAnncIndex;
- var integer v_resourceIndex;
-
- // Test control
-
- // Test component configuration
- f_cf02Up();
-
- // Test adapter configuration
-
- // Preamble
-
- if (PX_MN_CSE) {
- vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSE));
- }else if (PX_IN_CSE) {
- vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
- }
- f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
-
- vc_cse1.start(f_cse_announcementProcedure_createHandler());
- v_resourceIndex := f_cse_createResource(int2, m_createAe(PX_TS_AE1.appId, omit, omit));
- f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
-
- if(p_resourceType == int4) {
- v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_parentIndex);
- v_parentIndex := v_containerIndex;
- }
-
- // Test Body
- v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex);
-
- vc_cse1.start(f_cse_receiveCreateRequest_cseSimu(p_requestAnnc));
- f_send(e_mca_port, m_request(v_request));
- f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
-
- vc_request.primitive.requestPrimitive := f_getRequestPrimitive(vc_cse1);
-
- // Postamble
- f_cse_postamble_deleteResources();
-
- // Tear down
- f_cf02Down();
-
- //return v_anncRequest.primitive.requestPrimitive;
-
- }//end f_CSE_DMR_CRE_023
-
}//end group Create
group Retrieve {
@@ -6070,137 +5912,7 @@ module OneM2M_PermutationFunctions {
}
} //end function f_CSE_DMR_UPD_016
-
- function f_CSE_DMR_UPD_017(ResourceType p_resourceType, template RequestPrimitive p_requestCreatePrimitive, template RequestPrimitive p_createRequestAnnc, template RequestPrimitive p_requestUpdatePrimitive) runs on CseSimu system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var MsgIn v_request;
- var RequestPrimitive v_requestUpdatePrimitive;
- var integer v_parentIndex := -1;
- var integer v_aeIndex := -1;
- var integer v_latestResourceIndex;
- var ResponsePrimitive v_responsePrimitive;
- var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
- v_create.primitiveContent.aE.announceTo := {PX_TS_CSE1.cseId};
-
- //Test control
-
- // Test component configuration
- f_cf02UpCseSimuMaster();
-
- // Test adapter configuration
- // Register the CSE
- f_cse_registerRemoteCse(m_createRemoteCSEBase);
-
- //Preamble
-
- v_ae1.start(f_cse_createResource(int2,v_create));
- f_cse_announcementProcedure_createHandler(mw_createAEAnnc(-, -, -));
- v_ae1.done;
-
- v_aeIndex:= f_getLatestResourceIndex(v_ae1);
-
- v_ae1.start(f_cse_createResource(p_resourceType, p_requestCreatePrimitive, v_aeIndex));
- v_ae1.done;
-
- v_latestResourceIndex := f_getLatestResourceIndex(v_ae1);
-
- // Test Body
- v_ae1.start(f_cse_updateResource(p_resourceType, v_latestResourceIndex, p_requestUpdatePrimitive));
-
- tc_ac.start;
- alt {
- [] mccPortIn.receive(mw_request(p_createRequestAnnc)) -> value v_request {
- tc_ac.stop;
- setverdict(pass, __SCOPE__ & ":INFO: CREATE REQUEST received");
-
- if(match(v_request.primitive.requestPrimitive.to_, f_getLocalResourceAddress(lengthof(vc_localResourcesList)-1, e_hierarchical, e_spRelative)) or
- match(v_request.primitive.requestPrimitive.to_, f_getLocalResourceAddress(lengthof(vc_localResourcesList)-1, e_nonHierarchical, e_spRelative))) {
- setverdict(pass, __SCOPE__ & ":matching ANNC_PARENT_RESOURCE_ADDRESS");
- } else {
- setverdict(fail, __SCOPE__ & ":mis-matching ANNC_PARENT_RESOURCE_ADDRESS");
- }
-
- }
- [] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ":ERROR: No CREATE REQUEST received");
- }
- }
- v_ae1.done;
-
- // Postamble
- f_cse_postamble_deleteResourcesCSE();
-
- // Tear down
- f_cf02DownCseSimuMaster();
-
- }//end f_CSE_DMR_UPD_017
-
- function f_CSE_DMR_UPD_018(ResourceType p_resourceType, template RequestPrimitive p_requestCreatePrimitive, template RequestPrimitive p_createRequestAnnc, template RequestPrimitive p_requestUpdatePrimitive, template RequestPrimitive p_updateRequestAnnc) runs on CseSimu system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var MsgIn v_request;
- var RequestPrimitive v_requestUpdatePrimitive;
- var integer v_parentIndex := -1;
- var integer v_aeIndex := -1;
- var integer v_latestResourceIndex;
- var ResponsePrimitive v_responsePrimitive;
- var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
-
- v_create.primitiveContent.aE.announceTo := {PX_TS_CSE1.cseId};
-
- //Test control
-
- // Test component configuration
- f_cf02UpCseSimuMaster();
-
- // Test adapter configuration
- // Register the CSE
- f_cse_registerRemoteCse(m_createRemoteCSEBase);
-
- //Preamble
-
- v_ae1.start(f_cse_createResource(int2,v_create));
- f_cse_announcementProcedure_createHandler(mw_createAEAnnc(-, -, -));
- v_ae1.done;
-
- v_aeIndex := f_getLatestResourceIndex(v_ae1);
-
- v_ae1.start(f_cse_createResource(p_resourceType, p_requestCreatePrimitive, v_aeIndex));
- f_cse_announcementProcedure_createHandler(p_createRequestAnnc);
- v_ae1.done;
-
- v_latestResourceIndex := f_getLatestResourceIndex(v_ae1);
- p_updateRequestAnnc.to_ := f_getLocalResourceAddress(lengthof(vc_localResourcesList)-1);
-
- // Test Body
- v_ae1.start(f_cse_updateResource(p_resourceType, v_latestResourceIndex, p_requestUpdatePrimitive));
-
- tc_ac.start;
- alt {
- [] mccPortIn.receive(mw_request(p_updateRequestAnnc)) -> value v_request {
- tc_ac.stop;
- setverdict(pass, __SCOPE__ & ":INFO: Announcement received");
-
- v_responsePrimitive := valueof(m_responsePrimitive(int2004,v_request.primitive.requestPrimitive.requestIdentifier));
- v_responsePrimitive.from_ := PX_TS_CSE1.cseId;
- v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_;
- f_send(e_mcc_in_port, m_response(v_responsePrimitive));
- }
- [] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ":ERROR: No announcement received");
- }
- }
- v_ae1.done;
-
- // Postamble
- f_cse_postamble_deleteResourcesCSE();
-
- // Tear down
- f_cf02DownCseSimuMaster();
-
- }//end f_CSE_DMR_UPD_018
-
+
function f_CSE_DMR_UPD_019(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, ResultContent p_resultContent) runs on AeSimu system CseSystem {
// Local variables