diff --git a/OneM2M_Testcases_CSE_Release_4.ttcn b/OneM2M_Testcases_CSE_Release_4.ttcn
index eccaf55843f77b95a8520287a524c726fa9c0050..b7e2103c6b97a91ec62fc1a4bd62bf35939ca490 100644
--- a/OneM2M_Testcases_CSE_Release_4.ttcn
+++ b/OneM2M_Testcases_CSE_Release_4.ttcn
@@ -7730,16 +7730,12 @@ module OneM2M_Testcases_CSE_Release_4 {
// Test component configuration
f_cf05Up();
-
- //Preamble
- v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-
+
// Test Body
-// v_request := f_getCreateRequestPrimitive(int20, v_createServiceSubscribedNode, v_aeIndex);
-// f_send(e_mcaPort, m_request(v_request));
- // ServiceSubscriptionProfile directly under CSEBase from superAE
- v_subscriptionProfileIndex := f_cse_createResource(int11, v_createServiceSubscriptionProfile, -1);
+ // ServiceSubscriptionProfile directly under CSEBase from superAE
+ vc_ae1.start(f_cse_createResource(int11, v_createServiceSubscriptionProfile, -1));
+ v_subscriptionProfileIndex := f_getLatestResourceIndex(vc_ae1);
// ServiceSubscribedNode under ServiceSubscriptionProfile
vc_ae1.start(f_cse_createResource(int20, v_createServiceSubscribedNode, v_subscriptionProfileIndex));
@@ -7801,20 +7797,17 @@ module OneM2M_Testcases_CSE_Release_4 {
// Test component configuration
f_cf05Up();
- //Preamble
- v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- // ServiceSubscriptionProfile directly under CSEBase from superAE
- v_subscriptionProfileIndex := f_cse_createResource(int11, v_createServiceSubscriptionProfile, -1);
+ // ServiceSubscriptionProfile directly under CSEBase from superAE
+ vc_ae1.start(f_cse_createResource(int11, v_createServiceSubscriptionProfile, -1));
+ v_subscriptionProfileIndex := f_getLatestResourceIndex(vc_ae1);
- // ServiceSubscribedNode under ServiceSubscriptionProfile
- v_serviceSubscribedNodeIndex := f_cse_createResource(int20, v_createServiceSubscribedNode, v_subscriptionProfileIndex);
+ // ServiceSubscribedNode under ServiceSubscriptionProfile
+ vc_ae1.start(f_cse_createResource(int20, v_createServiceSubscribedNode, v_subscriptionProfileIndex));
+ v_serviceSubscribedNodeIndex := f_getLatestResourceIndex(vc_ae1);
// Test Body
-
- // v_request := f_getUpdateRequestPrimitive(int20, v_resourceIndex, v_updateRequest);
- // f_send(e_mcaPort, m_request(v_request));
-
+
vc_ae1.start(f_cse_updateResource(int20, v_serviceSubscribedNodeIndex, v_updateServiceSubscribedNode));
v_requestPrimitive := mw_t8_request_post(v_requestResourceURI, -, niddConfig);
@@ -7876,21 +7869,17 @@ module OneM2M_Testcases_CSE_Release_4 {
// Test component configuration
f_cf05Up();
- //Preamble
- v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-
- // ServiceSubscriptionProfile directly under CSEBase from superAE
- v_subscriptionProfileIndex := f_cse_createResource(int11, v_createServiceSubscriptionProfile, -1);
+ // ServiceSubscriptionProfile directly under CSEBase from superAE
+ vc_ae1.start(f_cse_createResource(int11, v_createServiceSubscriptionProfile, -1));
+ v_subscriptionProfileIndex := f_getLatestResourceIndex(vc_ae1);
- // ServiceSubscribedNode under ServiceSubscriptionProfile
- v_serviceSubscribedNodeIndex := f_cse_createResource(int20, v_createServiceSubscribedNode, v_subscriptionProfileIndex);
+ // ServiceSubscribedNode under ServiceSubscriptionProfile
+ vc_ae1.start(f_cse_createResource(int20, v_createServiceSubscribedNode, v_subscriptionProfileIndex));
+ v_serviceSubscribedNodeIndex := f_getLatestResourceIndex(vc_ae1);
// Test Body
- // v_request := f_getUpdateRequestPrimitive(int20, v_serviceSubscribedNodeIndex, v_updateRequest);
- // f_send(e_mcaPort, m_request(v_request));
-
vc_ae1.start(f_cse_updateResource(int20, v_serviceSubscribedNodeIndex, v_updateServiceSubscribedNode));
v_requestPrimitive := m_t8_request_delete(v_requestResourceURI,v_requestHeader , niddConfig); // NIDD configuration delete request
@@ -7949,20 +7938,16 @@ module OneM2M_Testcases_CSE_Release_4 {
// Test component configuration
f_cf05Up();
- //Preamble
- v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-
- // ServiceSubscriptionProfile directly under CSEBase from superAE
- v_subscriptionProfileIndex := f_cse_createResource(int11, v_createServiceSubscriptionProfile, -1);
+ // ServiceSubscriptionProfile directly under CSEBase from superAE
+ vc_ae1.start(f_cse_createResource(int11, v_createServiceSubscriptionProfile, -1));
+ v_subscriptionProfileIndex := f_getLatestResourceIndex(vc_ae1);
- // ServiceSubscribedNode under ServiceSubscriptionProfile
- v_serviceSubscribedNodeIndex := f_cse_createResource(int20, v_createServiceSubscribedNode, v_subscriptionProfileIndex);
+ // ServiceSubscribedNode under ServiceSubscriptionProfile
+ vc_ae1.start(f_cse_createResource(int20, v_createServiceSubscribedNode, v_subscriptionProfileIndex));
+ v_serviceSubscribedNodeIndex := f_getLatestResourceIndex(vc_ae1);
// Test Body
- // v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
- // f_send(e_mcaPort, m_request(v_request));
-
vc_ae1.start(f_cse_deleteResource(v_serviceSubscribedNodeIndex));
v_requestPrimitive := m_t8_request_delete(v_requestResourceURI, v_requestHeader, niddConfig); // NIDD configuration delete request
@@ -8038,27 +8023,32 @@ module OneM2M_Testcases_CSE_Release_4 {
f_cf05Up();
//Preamble
- //f_send(e_mcaPort, m_request(v_request));
+
//Sending NIDD config request with ExternalId "M2M-Ext-ID" and MaxPacketSize
v_requestPrimitiveNIDDConfig := m_t8_request_post(v_requestResourceURI, v_requestHeader, niddConfig); // NIDD configuration delete request
mcnPort.send(mw_t8Request(v_requestPrimitiveNIDDConfig));
- //Registering AE with ExternalId "M2M-Ext-ID"
- v_aeIndex := f_cse_preamble_registerAeWithExternalId(-,-,-, "M2M-Ext-ID");//c_CRUDNDi);
- v_ae2Index := f_cse_preamble_registerAe();
+
+ //Registering AE with ExternalId "M2M-Ext-ID"
+ vc_ae1.start(f_cse_preamble_registerAeWithExternalId(-,-,-, "M2M-Ext-ID"));
+ v_aeIndex := f_getLatestResourceIndex(vc_ae1);
+
+ vc_ae1.start(f_cse_preamble_registerAe());
+ v_ae2Index := f_getLatestResourceIndex(vc_ae1);
if (vc_ae1.running) {
vc_ae1.stop;
}
+
+ vc_ae1.start(f_cse_createResource(int3, v_requestContainer, v_ae2Index));
+ v_resourceIndexContainer := f_getLatestResourceIndex(vc_ae1);
- v_resourceIndexContainer := f_cse_createResource(int3, v_requestContainer, v_ae2Index);
v_requestSubscription := m_createSubscriptionAdvanced(f_getResourceAddress(v_resourceIndexContainer), -, {f_getResourceAddress(v_aeIndex)}, m_eventNotificationCriteria({int3}), -, omit, omit, omit, -, omit);
- v_resourceIndexSubscription := f_cse_createResource(int23, v_requestSubscription, v_ae2Index);//Subscription
-
+
+ vc_ae1.start(f_cse_createResource(int23, v_requestSubscription, v_ae2Index));//Subscription
+ v_resourceIndexSubscription := f_getLatestResourceIndex(vc_ae1);
+
// Test Body
-
- // v_request := f_getCreateRequestPrimitive(int4, v_createRequest, v_ae2Index);
- // f_send(e_mcaPort, m_request(v_request));
vc_ae1.start(f_cse_createResource(int4, v_createRequest, v_ae2Index));
@@ -8145,28 +8135,32 @@ module OneM2M_Testcases_CSE_Release_4 {
f_cf05Up();
//Preamble
- //f_send(e_mcaPort, m_request(v_request));
//Sending NIDD config request with ExternalId "M2M-Ext-ID" and MaxPacketSize
v_requestPrimitiveNIDDConfig := m_t8_request_post(v_requestResourceURI, v_requestHeader, niddConfig); // NIDD configuration delete request
mcnPort.send(mw_t8Request(v_requestPrimitiveNIDDConfig));
+
//Registering AE with ExternalId "M2M-Ext-ID"
- v_aeIndex := f_cse_preamble_registerAeWithExternalId(-,-,-, "M2M-Ext-ID");//c_CRUDNDi);
- v_ae2Index := f_cse_preamble_registerAe();
-
+
+ vc_ae1.start(f_cse_preamble_registerAeWithExternalId(-,-,-, "M2M-Ext-ID"));
+ v_aeIndex := f_getLatestResourceIndex(vc_ae1);
+
+ vc_ae1.start(f_cse_preamble_registerAe());
+ v_ae2Index := f_getLatestResourceIndex(vc_ae1);
if(vc_ae1.running) {
vc_ae1.stop;
};
+
+ vc_ae1.start(f_cse_createResource(int3, v_requestContainer, v_ae2Index));
+ v_resourceIndexContainer := f_getLatestResourceIndex(vc_ae1);
- v_resourceIndexContainer := f_cse_createResource(int3, v_requestContainer, v_ae2Index);
v_requestSubscription := m_createSubscriptionAdvanced(f_getResourceAddress(v_resourceIndexContainer), -, {f_getResourceAddress(v_aeIndex)}, m_eventNotificationCriteria({int3}), -, omit, omit, omit, -, omit);
- v_resourceIndexSubscription := f_cse_createResource(int23, v_requestSubscription, v_ae2Index);//Subscription
+
+ vc_ae1.start(f_cse_createResource(int23, v_requestSubscription, v_ae2Index));//Subscription
+ v_resourceIndexSubscription := f_getLatestResourceIndex(vc_ae1);
// Test Body
-
- // v_request := f_getCreateRequestPrimitive(int4, v_createRequest, v_ae2Index);
- // f_send(e_mcaPort, m_request(v_request));
-
+
vc_ae1.start(f_cse_createResource(int4, v_createRequest, v_ae2Index));
vc_ae1.start(f_cse_notifyProcedure_representationHandler(v_contentNotification)); // check if the notification is well received and if its content matchs
@@ -8250,14 +8244,12 @@ module OneM2M_Testcases_CSE_Release_4 {
{
individualNiddDownlinkDataDelivery := v_niddDownlinkDataTransfer
};
-
-
-
+
// Test component configuration
f_cf05Up();
//Preamble
- //f_send(e_mcaPort, m_request(v_request));
+
//Sending NIDD config request with ExternalId "M2M-Ext-ID" and MaxPacketSize
v_requestPrimitiveNIDDConfig := m_t8_request_post(v_requestResourceURI, v_requestHeader, niddConfig); // NIDD configuration create request
mcnPort.send(mw_t8Request(v_requestPrimitiveNIDDConfig));
@@ -8355,7 +8347,7 @@ module OneM2M_Testcases_CSE_Release_4 {
f_cf05Up();
//Preamble
- //f_send(e_mcaPort, m_request(v_request));
+
//Sending NIDD config request with ExternalId "M2M-Ext-ID" and MaxPacketSize
v_requestPrimitiveNIDDConfig := m_t8_request_post(v_requestResourceURI, v_requestHeader, niddConfig); // NIDD configuration create request
mcnPort.send(mw_t8Request(v_requestPrimitiveNIDDConfig));
@@ -8440,7 +8432,7 @@ module OneM2M_Testcases_CSE_Release_4 {
f_cf05Up();
//Preamble
- //f_send(e_mcaPort, m_request(v_request));
+
//Sending NIDD config request with ExternalId "M2M-Ext-ID" and MaxPacketSize
v_requestPrimitiveNIDDConfig := m_t8_request_post(v_requestResourceURI, v_requestHeader, niddConfig); // NIDD configuration create request
mcnPort.send(mw_t8Request(v_requestPrimitiveNIDDConfig));