diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index a2a9aa4385749eb4bc60f642def9a6b697eaa3b6..d7d8a9c102b9524775e15b323a494d818d778b26 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -6495,7 +6495,6 @@ module OneM2M_PermutationFunctions {
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestCreatePrimitive, v_parentIndex);
vc_cse1.start(f_cse_announcementProcedure_createHandler(p_createRequestAnnc, int4000));
mcaPort.send(m_request(v_request));
- vc_cse1.done;
tc_ac.start;
alt {
@@ -6514,6 +6513,8 @@ module OneM2M_PermutationFunctions {
setverdict(fail, __SCOPE__, ": No answer while creating resource type " & int2str(enum2int(p_resourceType)));
}
}
+
+ vc_cse1.done;
// Postamble
f_cse_postamble_deleteResources();
@@ -6545,13 +6546,12 @@ module OneM2M_PermutationFunctions {
f_cse_registerRemoteCse(m_createRemoteCSEBase);
//Preamble
- f_cse_announcementProcedure_createHandler(mw_createAEAnnc(-, -, -));
v_ae1.start(f_cse_createResource(int2,v_create));
+ f_cse_announcementProcedure_createHandler(mw_createAEAnnc(-, -, -));
v_ae1.done;
// Test Body
v_ae1.start(f_cse_sendCreateRequestPrimitive(p_resourceType,p_requestCreatePrimitive, v_parentIndex));
- v_ae1.done;
tc_ac.start;
alt {
@@ -6571,6 +6571,8 @@ module OneM2M_PermutationFunctions {
setverdict(fail, __SCOPE__ & ":ERROR: No CREATE REQUEST received");
}
}
+
+ v_ae1.done;
// Postamble
f_cse_postamble_deleteResourcesCSE();
@@ -6587,10 +6589,10 @@ module OneM2M_PermutationFunctions {
var integer v_parentIndex := -1;
var integer v_aeIndex := -1;
var integer v_resourceIndex;
- var integer v_remoteCSEAnncIndex := -1;
+ var integer v_aEAnncIndex := -1;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
- v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
+ v_create.primitiveContent.container.announceTo := {PX_CSE1_ID};
// Test control
@@ -6602,13 +6604,12 @@ module OneM2M_PermutationFunctions {
f_cse_registerRemoteCse(m_createRemoteCSEBase);
//Preamble
- f_cse_announcementProcedure_createHandler(mw_createRemoteCSEAnnc(-, -, -));
v_ae1.start(f_cse_createResource(int2,v_create));
+ f_cse_announcementProcedure_createHandler(mw_createRemoteCSEAnnc(-, -, -));
v_ae1.done;
// Test Body
v_ae1.start(f_cse_sendCreateRequestPrimitive(p_resourceType,p_requestCreatePrimitive, v_parentIndex));
- v_ae1.done;
tc_ac.start;
alt {
@@ -6628,6 +6629,8 @@ module OneM2M_PermutationFunctions {
setverdict(fail, __SCOPE__ & ":ERROR: No CREATE REQUEST received");
}
}
+
+ v_ae1.done;
// Postamble
f_cse_postamble_deleteResourcesCSE();
@@ -6644,10 +6647,11 @@ module OneM2M_PermutationFunctions {
var integer v_parentIndex := -1;
var integer v_aeIndex := -1;
var integer v_resourceIndex;
- var integer v_remoteCSEAnncIndex := -1;
+ var integer v_aEAnncIndex := -1;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
- v_create.primitiveContent.aE.announceTo := {PX_CSE_ID};
+ v_create.primitiveContent.container.announceTo := {PX_CSE1_ID};
+
// Test control
// Test component configuration
@@ -6658,13 +6662,11 @@ module OneM2M_PermutationFunctions {
f_cse_registerRemoteCse(m_createRemoteCSEBase);
//Preamble
- f_cse_announcementProcedure_createHandler(mw_createRemoteCSEAnnc(-, -, -));
v_ae1.start(f_cse_createResource(int2,v_create));
v_ae1.done;
// Test Body
v_ae1.start(f_cse_sendCreateRequestPrimitive(p_resourceType,p_requestCreatePrimitive, v_parentIndex));
- v_ae1.done;
tc_ac.start;
alt {
@@ -6684,6 +6686,8 @@ module OneM2M_PermutationFunctions {
setverdict(fail, __SCOPE__ & ":ERROR: No CREATE REQUEST received");
}
}
+
+ v_ae1.done;
// Postamble
f_cse_postamble_deleteResourcesCSE();
@@ -6693,6 +6697,182 @@ module OneM2M_PermutationFunctions {
}//end f_CSE_ANNC_CRE_006
+ function f_CSE_ANNC_CRE_007_CseSimu(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit) runs on CseSimu {
+ // Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ var MsgIn v_request;
+ var integer v_parentIndex := -1;
+ var integer v_aeIndex := -1;
+ var integer v_resourceIndex;
+ var integer v_aEAnncIndex := -1;
+ var ResponsePrimitive v_responsePrimitive;
+ var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ v_create.primitiveContent.container.announceTo := {PX_CSE1_ID};
+
+ // Test control
+
+ // Test component configuration
+ f_cf02UpCseSimuMaster();
+
+ v_ae1.start(f_cse_createResource(int2,v_create));
+ v_ae1.done;
+
+ // Test Body
+ v_ae1.start(f_cse_sendCreateRequestPrimitive(p_resourceType,p_requestCreatePrimitive, v_parentIndex));
+
+ tc_ac.start;
+ alt {
+ [] mccPortIn.receive(mw_request(mw_createRemoteCSEAnnc(-, -, -))) -> value v_request {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ":INFO: CREATE REQUEST for remoteCSEAnnc received");
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, __SCOPE__ & ":ERROR: No CREATE REQUEST received");
+ }
+ }
+
+ 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(v_aEAnncIndex, e_hierarchical, e_spRelative)) or
+ match(v_request.primitive.requestPrimitive.to_, f_getLocalResourceAddress(v_aEAnncIndex, 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_ANNC_CRE_007
+
+ function f_CSE_ANNC_CRE_008_CseSimu(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit) runs on CseSimu {
+ // Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ var MsgIn v_request;
+ var integer v_parentIndex := -1;
+ var integer v_aeIndex := -1;
+ var integer v_resourceIndex;
+ var integer v_aEAnncIndex := -1;
+ var ResponsePrimitive v_responsePrimitive;
+ var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ v_create.primitiveContent.container.announceTo := {PX_CSE1_ID};
+
+ // Test control
+
+ // Test component configuration
+ f_cf02UpCseSimuMaster();
+
+ //Test adapter configuration
+ // Register the CSE
+ f_cse_registerRemoteCse(mw_createRemoteCSE);
+
+ v_ae1.start(f_cse_createResource(int2,v_create));
+ f_cse_announcementProcedure_createHandler(mw_createAEAnnc(-, -, -));
+ v_ae1.done;
+
+ // Test Body
+ v_ae1.start(f_cse_sendCreateRequestPrimitive(p_resourceType,p_requestCreatePrimitive, v_parentIndex));
+
+ 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(v_aEAnncIndex, e_hierarchical, e_spRelative)) or
+ match(v_request.primitive.requestPrimitive.to_, f_getLocalResourceAddress(v_aEAnncIndex, 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_ANNC_CRE_008
+
+ function f_CSE_ANNC_CRE_009_CseSimu(ResourceType p_resourceType, template RequestPrimitive p_createRequestAnnc, in template RequestPrimitive p_requestCreatePrimitive := omit) runs on CseSimu {
+ // Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ var MsgIn v_request;
+ var integer v_parentIndex := -1;
+ var integer v_aeIndex := -1;
+ var integer v_resourceIndex;
+ var integer v_aEAnncIndex := -1;
+ var ResponsePrimitive v_responsePrimitive;
+ var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ v_create.primitiveContent.container.announceTo := {PX_CSE1_ID};
+
+ // Test control
+
+ // Test component configuration
+ f_cf02UpCseSimuMaster();
+
+ //Test adapter configuration
+ // Register the CSE
+ f_cse_registerRemoteCse(mw_createRemoteCSE);
+
+ v_ae1.start(f_cse_createResource(int2,v_create));
+ f_cse_announcementProcedure_createHandler(mw_createAEAnnc(-, -, -));
+ v_ae1.done;
+
+ // Test Body
+ v_ae1.start(f_cse_sendCreateRequestPrimitive(p_resourceType,p_requestCreatePrimitive, v_parentIndex));
+
+ 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(v_aEAnncIndex, e_hierarchical, e_spRelative)) or
+ match(v_request.primitive.requestPrimitive.to_, f_getLocalResourceAddress(v_aEAnncIndex, 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_ANNC_CRE_009
+
} //end group Create
group Delete{
@@ -6783,17 +6963,17 @@ module OneM2M_PermutationFunctions {
f_cse_registerRemoteCse(m_createRemoteCSEBase);
//Preamble
- v_ae1.start(f_cse_createResource(int2,v_create));
+
+ v_ae1.start(f_cse_createResource(int2,v_create));
+ f_cse_announcementProcedure_createHandler(mw_createAEAnnc(-, -, -));
v_ae1.done;
- f_cse_announcementProcedure_createHandler(mw_createAEAnnc(-, -, -));
v_ae1.start(f_cse_createResource(p_resourceType, p_requestCreatePrimitive, vc_aeAuxIndex));
- v_ae1.done;
- f_cse_announcementProcedure_createHandler(p_createRequestAnnc);
+ f_cse_announcementProcedure_createHandler(p_createRequestAnnc);
+ v_ae1.done;
// Test Body
v_ae1.start(f_cse_deleteResource(lengthof(vc_resourcesList)-1));
- v_ae1.done;
tc_ac.start;
alt {
@@ -6808,7 +6988,8 @@ module OneM2M_PermutationFunctions {
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while waiting to receive Delete request");
}
- }
+ }
+ v_ae1.done;
// Postamble
f_cse_postamble_deleteResourcesCSE();
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index cd533f1c389d188a78f6c0fc894f174ae1eecae1..7e65e94708e59fbf9973c5006b565337494f1f52 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -560,7 +560,13 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT accepts an AE registration (allowed App-ID, S-AE-ID-STEM not provided by AE)
*
*/
- testcase TC_CSE_REG_CRE_005() runs on InCseSimu system CseSystem {
+ testcase TC_CSE_REG_CRE_005() runs on Tester system CseSystem {
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+ v_cse1.start(f_CSE_REG_CRE_005());
+ v_cse1.done;
+ }
+
+ function f_CSE_REG_CRE_005() runs on CseSimu system CseSystem {
var RequestPrimitive v_request;
var integer v_cseBaseIndex := -1;
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index 7dd1d4c0cd57a04259840ef8b655991b91dcca3a..27a982334fd07edffbc341c356aa42a37f115211 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -7102,52 +7102,178 @@ module OneM2M_Testcases_CSE_Release_2 {
}
} //end group g_CSE_ANNC_CRE_006
- }//end group Create
+
+ group g_CSE_ANNC_CRE_007 {
+
+ testcase TC_CSE_ANNC_CRE_007_ACP() runs on Tester system CseSystem {
+ //Local variables
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+ var template RequestPrimitive v_createRequest := m_createAcpBase;
+ var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
+
+ v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
+
+ v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
+ v_cse1.done;
+ }
+
+ testcase TC_CSE_ANNC_CRE_007_CNT() runs on Tester system CseSystem {
+ //Local variables
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+ var template RequestPrimitive v_createRequest := m_createContainerBase;
+ var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+
+ v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
+
+ v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
+ v_cse1.done;
+ }
+
+ testcase TC_CSE_ANNC_CRE_007_CIN() runs on Tester system CseSystem {
+ //Local variables
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+ var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
+ var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
+
+ v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
+
+ v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
+ v_cse1.done;
+
+ }
+
+ testcase TC_CSE_ANNC_CRE_007_GRP() runs on Tester system CseSystem {
+ //Local variables
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+ var template RequestPrimitive v_createRequest := m_createGroupBase;
+ var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+
+ v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
+
+ v_cse1.start(f_CSE_ANNC_CRE_007_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group
+ v_cse1.done;
+ }
+
+ } //end group g_CSE_ANNC_CRE_007
+
+ group g_CSE_ANNC_CRE_008 {
+
+ testcase TC_CSE_ANNC_CRE_008_ACP_MBS() runs on Tester system CseSystem {
+ //Local variables
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+ var template RequestPrimitive v_createRequest := m_createAcpBase;
+ var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
+
+ v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
+ v_createRequest.primitiveContent.accessControlPolicy.announcedAttribute := {"maxByteSize"};
+
+ v_cse1.start(f_CSE_ANNC_CRE_008_CseSimu(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
+ v_cse1.done;
+ }
+
+ testcase TC_CSE_ANNC_CRE_007_CNT_CNF() runs on Tester system CseSystem {
+ //Local variables
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+ var template RequestPrimitive v_createRequest := m_createContainerBase;
+ var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+
+ v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
+ v_createRequest.primitiveContent.container.announcedAttribute := {"contentInfo"};
+
+ v_cse1.start(f_CSE_ANNC_CRE_008_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
+ v_cse1.done;
+ }
+
+ testcase TC_CSE_ANNC_CRE_007_CIN_MT() runs on Tester system CseSystem {
+ //Local variables
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+ var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
+ var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
+
+ v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
+ v_createRequest.primitiveContent.container.announcedAttribute := {"memberType"};
+
+ v_cse1.start(f_CSE_ANNC_CRE_008_CseSimu(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
+ v_cse1.done;
+
+ }
+
+ testcase TC_CSE_ANNC_CRE_007_GRP_LOI() runs on Tester system CseSystem {
+ //Local variables
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+ var template RequestPrimitive v_createRequest := m_createGroupBase;
+ var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
+
+ v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
+ v_createRequest.primitiveContent.container.announcedAttribute := {"locationContainerID"};
+
+ v_cse1.start(f_CSE_ANNC_CRE_008_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group
+ v_cse1.done;
+ }
+
+ } //end group g_CSE_ANNC_CRE_008
+
+ group g_CSE_ANNC_CRE_009 {
+
+ testcase TC_CSE_ANNC_CRE_009_CNT() runs on Tester system CseSystem {
+ //Local variables
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+ var template RequestPrimitive v_createRequest := m_createContainerBase;
+ var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
+
+ v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
+ v_createRequest.primitiveContent.container.labels := {"MyLabel"};
+
+ v_cse1.start(f_CSE_ANNC_CRE_009_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
+ v_cse1.done;
+ }
+ } //end group g_CSE_ANNC_CRE_009
+ } //end group Create
group Delete{
group g_CSE_ANNC_DEL_001{
-
+
testcase TC_CSE_ANNC_DEL_001_ACP() runs on Tester system CseSystem {
// Local variables
- var MnCseSimu v_cse1 := MnCseSimu.create("CSE1") alive;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createAcpBase;
var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
- v_cse1.start(f_CSE_ANNC_DEL_001(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
- v_cse1.done;
+ v_ae1.start(f_CSE_ANNC_DEL_001(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
+ v_ae1.done;
}
-
+
testcase TC_CSE_ANNC_DEL_001_CNT() runs on Tester system CseSystem {
// Local variables
- var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createContainerBase;
var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
- v_cse1.start(f_CSE_ANNC_DEL_001(int3, v_createRequestAnnc, v_createRequest));//Container
- v_cse1.done;
+ v_ae1.start(f_CSE_ANNC_DEL_001(int3, v_createRequestAnnc, v_createRequest));//Container
+ v_ae1.done;
}
-
+
testcase TC_CSE_ANNC_DEL_001_GRP() runs on Tester system CseSystem {
// Local variables
- var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createGroupBase;
var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
- v_cse1.start(f_CSE_ANNC_DEL_001(int9, v_createRequestAnnc, v_createRequest));//Group
- v_cse1.done;
+ v_ae1.start(f_CSE_ANNC_DEL_001(int9, v_createRequestAnnc, v_createRequest));//Group
+ v_ae1.done;
}
}// end group g_CSE_ANNC_DEL_001
-
+
group g_CSE_ANNC_DEL_002{
-
+
testcase TC_CSE_ANNC_DEL_002_ACP() runs on Tester system CseSystem {
// Local variables
var MnCseSimu v_cse1 := MnCseSimu.create("CSE1") alive;
@@ -7159,7 +7285,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_cse1.start(f_CSE_ANNC_DEL_002(int1, v_createRequestAnnc, v_createRequest));//AccessControlPolicy
v_cse1.done;
}
-
+
testcase TC_CSE_ANNC_DEL_002_CNT() runs on Tester system CseSystem {
// Local variables
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
@@ -7171,7 +7297,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_cse1.start(f_CSE_ANNC_DEL_002(int3, v_createRequestAnnc, v_createRequest));//Container
v_cse1.done;
}
-
+
testcase TC_CSE_ANNC_DEL_002_GRP() runs on Tester system CseSystem {
// Local variables
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
@@ -7183,9 +7309,10 @@ module OneM2M_Testcases_CSE_Release_2 {
v_cse1.start(f_CSE_ANNC_DEL_002(int9, v_createRequestAnnc, v_createRequest));//Group
v_cse1.done;
}
-
+
}// end group g_CSE_ANNC_DEL_002
}//end group Delete
+
}//end group Announcement
}//end group CSE