diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index a01ca5606550e247c2fc80a551e4d9a9369e1d7c..4a53af22a4e85a9db761065d319a074ca501107f 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -1352,7 +1352,7 @@ module OneM2M_Functions {
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));
+ f_cse_sendUtPrimitive_cseSimu(v_utRequest, v_action & f_getLocalResourceAddress(vc_localRemoteCseIndex));
tc_ac.start;
alt {
@@ -2399,7 +2399,7 @@ module OneM2M_Functions {
//Activate defaults when running on a PTC
f_cse_activateDefaults_cse1();
- f_sendUtPrimitive(p_utRequest, p_action);
+ f_cse_sendUtPrimitive_cseSimu(p_utRequest, p_action);
tc_ac.start;
alt {
@@ -2786,7 +2786,7 @@ module OneM2M_Functions {
f_cse_activateDefaults_cse1();
//send triggering primitive to SUT
- f_sendUtPrimitive(v_utRequest,v_action);
+ f_cse_sendUtPrimitive_cseSimu(v_utRequest,v_action);
tc_ac.start;
alt {
@@ -3603,6 +3603,70 @@ module OneM2M_Functions {
}
}//end group CseAltstepFunctions
+ group UtFunctions {
+
+ /**
+ * @desc Sending of an Upper Tester primitive
+ * @param p_utRequest Action to be performed by IUT
+ * @param p_action Description of the given action to be performed by the IUT
+ * @verdict
+ */
+ function f_cse_sendUtPrimitive(template UtTriggerPrimitive p_utRequest, in universal charstring p_action) runs on AeSimu {
+
+ if (PX_UT_IMPLEMENTED){
+
+ p_utRequest.requestPrimitive.requestIdentifier := "m_uttriggerPrimitive" & f_rnd(1, 1000000);
+
+ deactivate;
+
+ f_sendUtPrimitive(p_utRequest);
+
+ f_checkAeSimuStatus();
+
+ activate(a_default());
+ if(vc_config == e_cf01) {
+ vc_aeSimu := activate(a_cse_cf01());
+ } else if ((vc_config == e_cf02) or (vc_config == e_cf02CseSimuMaster)) {
+ if(vc_testSystemRole == e_ae) {
+ vc_aeSimu := activate(a_cse_cf02_ae1());
+ }
+ }
+ } else {
+ action(p_action);
+ }
+ }
+
+ /**
+ * @desc Sending of an Upper Tester primitive
+ * @param p_utRequest Action to be performed by IUT
+ * @param p_action Description of the given action to be performed by the IUT
+ * @verdict
+ */
+ function f_cse_sendUtPrimitive_cseSimu(template UtTriggerPrimitive p_utRequest, in universal charstring p_action) runs on CseSimu {
+
+ if (PX_UT_IMPLEMENTED){
+
+ p_utRequest.requestPrimitive.requestIdentifier := "m_uttriggerPrimitive" & f_rnd(1, 1000000);
+
+ deactivate;
+
+ f_sendUtPrimitive(p_utRequest);
+
+ f_checkCseSimuStatus();
+
+ activate(a_default());
+ if ((vc_config == e_cf02) or (vc_config == e_cf02CseSimuMaster)) {
+ if (vc_testSystemRole == e_cse) {
+ vc_cseSimu := activate(a_cse_cf02_cse1());
+ }
+ }
+ } else {
+ action(p_action);
+ }
+ }
+
+ }//end group UtFunctions
+
}//end cseFunctions
group AeFunctions {
@@ -3626,7 +3690,7 @@ module OneM2M_Functions {
p_utRequest := m_utCreateAe;
}
- f_sendUtPrimitive(p_utRequest, v_action);
+ f_ae_sendUtPrimitive(p_utRequest, v_action);
tc_ac.start;
alt {
@@ -3669,7 +3733,7 @@ module OneM2M_Functions {
p_utRequest.requestPrimitive.primitiveContent.container := m_contentCreateContainer;
}
- f_sendUtPrimitive(p_utRequest, v_action);
+ f_ae_sendUtPrimitive(p_utRequest, v_action);
tc_ac.start;
alt {
@@ -3716,7 +3780,7 @@ module OneM2M_Functions {
p_utRequest.requestPrimitive.primitiveContent.pollingChannel := m_contentCreatePollingChannel;
}
- f_sendUtPrimitive(p_utRequest, v_action);
+ f_ae_sendUtPrimitive(p_utRequest, v_action);
tc_ac.start;
alt {
@@ -3813,6 +3877,40 @@ module OneM2M_Functions {
}
}//end group AeAltstepFunctions
+ group UtFunctions {
+
+ /**
+ * @desc Sending of an Upper Tester primitive
+ * @param p_utRequest Action to be performed by IUT
+ * @param p_action Description of the given action to be performed by the IUT
+ * @verdict
+ */
+ function f_ae_sendUtPrimitive(template UtTriggerPrimitive p_utRequest, in universal charstring p_action) runs on CseSimu {
+
+ if (PX_UT_IMPLEMENTED){
+
+ p_utRequest.requestPrimitive.requestIdentifier := "m_uttriggerPrimitive" & f_rnd(1, 1000000);
+
+ deactivate;
+
+ f_sendUtPrimitive(p_utRequest);
+
+ f_checkCseSimuStatus();
+
+ activate(a_default());
+ if (vc_config == e_cf03) {
+ vc_cseSimu := activate(a_ae_cf03());
+ } else if (vc_config == e_cf04) {
+ vc_cseSimu := activate(a_cse_cf04());
+ }
+ }else{
+ action(p_action);
+ }
+ }
+
+
+ }//end group UtFunctions
+
}//end of aeFunctions
@@ -5505,52 +5603,23 @@ module OneM2M_Functions {
* @param p_action Description of the given action to be performed by the IUT
* @verdict
*/
- function f_sendUtPrimitive(template UtTriggerPrimitive p_utRequest, in universal charstring p_action) runs on CseSimu {
+ function f_sendUtPrimitive(template UtTriggerPrimitive p_utRequest) runs on Tester {
- if (PX_UT_IMPLEMENTED){
-
- p_utRequest.requestPrimitive.requestIdentifier := "m_uttriggerPrimitive" & f_rnd(1, 1000000);
-
- deactivate;
- utPort.send(valueof(p_utRequest));
-
- tc_wait.start;
- alt{
- [] utPort.receive(mw_utResponseOK) {
- tc_wait.stop;
- setverdict(pass, __SCOPE__ & " : Triggering message is successfully received!");
- }
- [] utPort.receive(mw_utResponseKO) {
- tc_wait.stop;
- setverdict(inconc, __SCOPE__ & " : Error while receiving Triggering message!");
- }
- [] tc_wait.timeout{
- setverdict(inconc, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
- }
+ utPort.send(valueof(p_utRequest));
+
+ tc_wait.start;
+ alt{
+ [] utPort.receive(mw_utResponseOK) {
+ tc_wait.stop;
+ setverdict(pass, __SCOPE__ & " : Triggering message is successfully received!");
}
-
- f_checkCseSimuStatus();
-
- activate(a_default());
- //In case UtPrimitive is used from AeSimu
- /*if(vc_config == e_cf01) {
- vc_aeSimu := activate(a_cse_cf01());
- } else if ((vc_config == e_cf02) or (vc_config == e_cf02CseSimuMaster)) {
- if(vc_testSystemRole == e_ae) {
- vc_aeSimu := activate(a_cse_cf02_ae1());
- } else if (vc_testSystemRole == e_cse) {
- vc_cseSimu := activate(a_cse_cf02_cse1());
- }
- } else */
- if (vc_config == e_cf03) {
- vc_cseSimu := activate(a_ae_cf03());
- } else if (vc_config == e_cf04) {
- vc_cseSimu := activate(a_cse_cf04());
+ [] utPort.receive(mw_utResponseKO) {
+ tc_wait.stop;
+ setverdict(inconc, __SCOPE__ & " : Error while receiving Triggering message!");
+ }
+ [] tc_wait.timeout{
+ setverdict(inconc, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
}
- }else{
-
- action(p_action);
-
}
}
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 6134feaee6946f9b1c80eb473fefd631a126185b..e66e5083b2192ab382256e53b900aed4c8c27e25 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -43,7 +43,7 @@ module OneM2M_PermutationFunctions {
//Send Trigger Message
v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, e_nonHierarchical, p_primitiveScope);
- f_sendUtPrimitive(v_utRequest, v_action & f_getLocalResourceAddress(-, e_nonHierarchical, p_primitiveScope));
+ f_ae_sendUtPrimitive(v_utRequest, v_action & f_getLocalResourceAddress(-, e_nonHierarchical, p_primitiveScope));
tc_ac.start;
alt {
@@ -85,7 +85,7 @@ module OneM2M_PermutationFunctions {
//Send Trigger Message
v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, e_hierarchical, p_primitiveScope);
- f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(-, e_hierarchical, p_primitiveScope));
+ f_ae_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(-, e_hierarchical, p_primitiveScope));
tc_ac.start;
@@ -135,7 +135,7 @@ module OneM2M_PermutationFunctions {
v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex, e_nonHierarchical, p_primitiveScope);
- f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex, e_nonHierarchical, p_primitiveScope));
+ f_ae_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex, e_nonHierarchical, p_primitiveScope));
tc_ac.start;
alt {
@@ -178,7 +178,7 @@ module OneM2M_PermutationFunctions {
v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex, e_hierarchical, p_primitiveScope);
- f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex, e_hierarchical, p_primitiveScope));
+ f_ae_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex, e_hierarchical, p_primitiveScope));
tc_ac.start;
alt {
@@ -226,7 +226,7 @@ module OneM2M_PermutationFunctions {
v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
v_utRequest := m_utRetrieve(f_getLocalResourceAddress(v_resourceIndex, e_nonHierarchical, p_primitiveScope));
- f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex, e_nonHierarchical, p_primitiveScope));
+ f_ae_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex, e_nonHierarchical, p_primitiveScope));
tc_ac.start;
alt {
@@ -269,7 +269,7 @@ module OneM2M_PermutationFunctions {
v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
v_utRequest := m_utRetrieve(f_getLocalResourceAddress(v_resourceIndex, e_hierarchical, p_primitiveScope));
- f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex, e_hierarchical, p_primitiveScope));
+ f_ae_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex, e_hierarchical, p_primitiveScope));
tc_ac.start;
alt {
@@ -317,7 +317,7 @@ module OneM2M_PermutationFunctions {
v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_auxInteger := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope);
- f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope));
+ f_ae_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope));
tc_ac.start;
alt {
@@ -360,7 +360,7 @@ module OneM2M_PermutationFunctions {
v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_auxInteger := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope);
- f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope));
+ f_ae_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope));
tc_ac.start;
@@ -409,7 +409,7 @@ module OneM2M_PermutationFunctions {
//Send Trigger Message
p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, -, -);
p_request.to_ := p_utRequest.requestPrimitive.to_;
- f_sendUtPrimitive(p_utRequest,p_action & f_getLocalResourceAddress(-, -, -));
+ f_ae_sendUtPrimitive(p_utRequest,p_action & f_getLocalResourceAddress(-, -, -));
//Test behavior
tc_ac.start;
@@ -463,7 +463,7 @@ module OneM2M_PermutationFunctions {
v_containerIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_containerIndex, -, -);
p_request.to_ := p_utRequest.requestPrimitive.to_;
- f_sendUtPrimitive(p_utRequest,p_action & f_getLocalResourceAddress(v_containerIndex, -, -));
+ f_ae_sendUtPrimitive(p_utRequest,p_action & f_getLocalResourceAddress(v_containerIndex, -, -));
//Test behavior
tc_ac.start;
@@ -501,7 +501,7 @@ module OneM2M_PermutationFunctions {
//send triggering primitive to SUT
p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, -, -);
p_request.to_ := p_utRequest.requestPrimitive.to_;
- f_sendUtPrimitive(p_utRequest,p_action & f_getLocalResourceAddress(-, -, -));
+ f_ae_sendUtPrimitive(p_utRequest,p_action & f_getLocalResourceAddress(-, -, -));
//Test behavior
tc_ac.start;
@@ -548,7 +548,7 @@ module OneM2M_PermutationFunctions {
v_localResource := f_generateLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, -, -, omit))), vc_cSEBaseIndex, int2);
v_resourceIndex := f_setLocalResource(v_localResource, int2, vc_cSEBaseIndex);
p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex);
- f_sendUtPrimitive(p_utRequest,p_action & f_getLocalResourceAddress(v_resourceIndex));
+ f_ae_sendUtPrimitive(p_utRequest,p_action & f_getLocalResourceAddress(v_resourceIndex));
//Test behavior
@@ -587,7 +587,7 @@ module OneM2M_PermutationFunctions {
v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex);
- f_sendUtPrimitive(p_utRequest,p_action & f_getLocalResourceAddress(v_resourceIndex));
+ f_ae_sendUtPrimitive(p_utRequest,p_action & f_getLocalResourceAddress(v_resourceIndex));
//Test behavior
tc_ac.start;
@@ -638,7 +638,7 @@ module OneM2M_PermutationFunctions {
v_resourceIndex := vc_cSEBaseIndex;
}
v_utRequest := m_utRetrieve(f_getLocalResourceAddress(v_resourceIndex));
- f_sendUtPrimitive(v_utRequest,p_action & f_getLocalResourceAddress(v_resourceIndex));
+ f_ae_sendUtPrimitive(v_utRequest,p_action & f_getLocalResourceAddress(v_resourceIndex));
//Test behavior
tc_ac.start;
@@ -688,7 +688,7 @@ module OneM2M_PermutationFunctions {
//send triggering primitive to SUT
p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress();
- f_sendUtPrimitive(p_utRequest,p_action);
+ f_ae_sendUtPrimitive(p_utRequest,p_action);
//Test behavior
tc_ac.start;
@@ -2009,7 +2009,7 @@ module OneM2M_PermutationFunctions {
f_cf04Up();
//send triggering primitive to SUT
- f_sendUtPrimitive(p_utRequest,p_action);
+ f_cse_sendUtPrimitive_cseSimu(p_utRequest,p_action);
//Test behavior
tc_ac.start;
@@ -2293,7 +2293,7 @@ module OneM2M_PermutationFunctions {
//Send Trigger Message
v_utRequest.requestPrimitive.to_ := f_getResourceAddress();
- f_sendUtPrimitive(v_utRequest, v_action);
+ f_cse_sendUtPrimitive_cseSimu(v_utRequest, v_action);
// Test Body
v_request := f_getUpdateRequestPrimitive(int16, vc_remoteCseIndex, p_requestPrimitive);
diff --git a/OneM2M_Testcases_AE_Release_1.ttcn b/OneM2M_Testcases_AE_Release_1.ttcn
index 155e23878301d68404f8d9afae7ffc612e3faaee..c68acd9bb35795a19cb07963e36bc57ff2119c83 100644
--- a/OneM2M_Testcases_AE_Release_1.ttcn
+++ b/OneM2M_Testcases_AE_Release_1.ttcn
@@ -474,7 +474,7 @@ module OneM2M_Testcases_AE_Release_1 {
//Send Trigger Message
v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, -, -);
v_requestPrimitive.to_ := v_utRequest.requestPrimitive.to_;
- f_sendUtPrimitive(v_utRequest, v_action & f_getLocalResourceAddress(-, -, -));
+ f_ae_sendUtPrimitive(v_utRequest, v_action & f_getLocalResourceAddress(-, -, -));
//Test behavior
tc_ac.start;
@@ -692,7 +692,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_localResource := f_generateLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, -, -, omit))), vc_cSEBaseIndex, int2);
v_auxInteger := f_setLocalResource(v_localResource, int2, vc_cSEBaseIndex);
v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger, -, -);
- f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_auxInteger, -, -));
+ f_ae_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_auxInteger, -, -));
//Test behavior
tc_ac.start;
@@ -754,7 +754,7 @@ module OneM2M_Testcases_AE_Release_1 {
//send triggering primitive to SUT
v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, -, -);
v_requestPrimitive.to_ := v_utRequest.requestPrimitive.to_;
- f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(-, -, -));
+ f_ae_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(-, -, -));
//Test behavior
tc_ac.start;
@@ -810,7 +810,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_containerIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_containerIndex, -, -);
v_requestPrimitive.to_ := v_utRequest.requestPrimitive.to_;
- f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_containerIndex, -, -));
+ f_ae_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_containerIndex, -, -));
//Test behavior
tc_ac.start;
@@ -1314,7 +1314,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_resourceIndex := f_setLocalResource(v_localResource, int4, v_containerResourceIndex);
v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_containerResourceIndex) & "/" & c_resourceShortNameOldest;
- f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_containerResourceIndex));
+ f_ae_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_containerResourceIndex));
//Test behavior
tc_ac.start;
@@ -1373,7 +1373,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_resourceIndex := f_setLocalResource(v_localResource, int4, v_containerResourceIndex);
v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_containerResourceIndex) & "/" & c_resourceShortNameLatest;
- f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_containerResourceIndex));
+ f_ae_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_containerResourceIndex));
//Test behavior
@@ -1430,7 +1430,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex);
- f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex));
+ f_ae_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex));
//Test behavior
tc_ac.start;
@@ -1488,7 +1488,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_localResource := f_generateLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), v_resourceIndex, int4);
v_resourceIndex := f_setLocalResource(v_localResource, int4, v_resourceIndex);
v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex);
- f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex));
+ f_ae_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex));
//Test behavior
tc_ac.start;
@@ -1548,7 +1548,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex) & "/" & c_resourceShortNameOldest;
- f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex));
+ f_ae_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex));
//Test behavior
tc_ac.start;
@@ -1609,7 +1609,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex) & "/" & c_resourceShortNameLatest;
- f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex));
+ f_ae_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex));
//Test behavior
tc_ac.start;
@@ -1670,7 +1670,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex);
- f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex));
+ f_ae_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex));
//Test behavior
tc_ac.start;
@@ -1733,7 +1733,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_localResource := f_generateLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), v_containerResourceIndex, int4);
v_resourceIndex := f_setLocalResource(v_localResource, int4, v_containerResourceIndex);
v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex);
- f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex));
+ f_ae_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex));
//Test behavior
tc_ac.start;
@@ -1800,7 +1800,7 @@ module OneM2M_Testcases_AE_Release_1 {
//send triggering primitive to SUT
v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress();
- f_sendUtPrimitive(v_utRequest,v_action);
+ f_ae_sendUtPrimitive(v_utRequest,v_action);
//Test behavior
tc_ac.start;
@@ -2120,7 +2120,7 @@ module OneM2M_Testcases_AE_Release_1 {
//Trigger IUT for sending a polling request (req1)
v_utRequest3 := valueof(m_utRetrievePollingChannelUri(f_getLocalResourceAddress(v_pollingChannelIndex) & "/" & c_resourceShortNamePollingChannelUri));
- f_sendUtPrimitive(v_utRequest3,v_action3);
+ f_ae_sendUtPrimitive(v_utRequest3,v_action3);
tc_ac.start;
alt {
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 7810da957d159733aa6653b14765533645bec1a7..c131b87fa7a311b3f9592bb591de539424caaab4 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -1725,7 +1725,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Preamble
//send triggering primitive to SUT
- f_sendUtPrimitive(v_utRequest,v_action);
+ f_cse_sendUtPrimitive_cseSimu(v_utRequest,v_action);
// Test Body
tc_ac.start;
@@ -2875,7 +2875,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Send Trigger Message
v_utRequest := m_utRetrieve(f_getLocalResourceAddress(vc_localRemoteCseIndex));
- f_sendUtPrimitive(v_utRequest, v_action & f_getLocalResourceAddress(vc_localRemoteCseIndex));
+ f_cse_sendUtPrimitive_cseSimu(v_utRequest, v_action & f_getLocalResourceAddress(vc_localRemoteCseIndex));
tc_ac.start;
alt {
@@ -3389,7 +3389,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Send Trigger Message
v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(vc_localRemoteCseIndex);
- f_sendUtPrimitive(v_utRequest, v_action & f_getLocalResourceAddress(vc_localRemoteCseIndex));
+ f_cse_sendUtPrimitive_cseSimu(v_utRequest, v_action & f_getLocalResourceAddress(vc_localRemoteCseIndex));
// Test Body
tc_ac.start;
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index ab0e2ceb361115dfc95ee714c3c5e4e6aa6e7e29..dc629c1ea24e05d4d817f7224f3eaf02537dab53 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -3692,7 +3692,7 @@ module OneM2M_Testcases_CSE_Release_2 {
//Trigger IUT for sending a polling request (req1)
v_utRequest2 := valueof(m_utRetrievePollingChannelUri(f_getLocalResourceAddress(v_localResourceIndex) & "/" & c_resourceShortNamePollingChannelUri));
- f_sendUtPrimitive(v_utRequest2,v_action2);
+ f_cse_sendUtPrimitive_cseSimu(v_utRequest2,v_action2);
tc_ac.start;
alt {