diff --git a/OneM2M_Testcases_CSE_Release_3.ttcn b/OneM2M_Testcases_CSE_Release_3.ttcn
index 88eada032a9e8b27a120b92d2f77d409bd8fde0a..85a9422dca20f6a14fe35b2bf7bdf600717c5ee0 100644
--- a/OneM2M_Testcases_CSE_Release_3.ttcn
+++ b/OneM2M_Testcases_CSE_Release_3.ttcn
@@ -12144,10 +12144,10 @@ module OneM2M_Testcases_CSE_Release_3 {
*/
testcase TC_CSE_DAU_NTF_001() runs on Tester system CseSystem {
//Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ var AeSimu v_das := AeSimu.create("DAS") alive;
- v_ae1.start(f_CSE_DAU_NTF_001());
- v_ae1.done;
+ v_das.start(f_CSE_DAU_NTF_001());
+ v_das.done;
}
function f_CSE_DAU_NTF_001() runs on AeSimu {
@@ -12155,7 +12155,7 @@ module OneM2M_Testcases_CSE_Release_3 {
//Local variables
var ResponsePrimitive v_notificationResponse;
var integer v_dasIndex := -1;
- var integer v_ae2Index := -1;
+ var integer v_ae1Index := -1;
var integer v_containerIndex, v_acpIndex := -1;
var integer v_dynamicAuthorizationConsultationIndex := -1;
@@ -12176,7 +12176,7 @@ module OneM2M_Testcases_CSE_Release_3 {
// Preamble
v_dasIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_dau_master(v_ae2Index, v_acpIndex);//Configure aux AE2 and create ACP
+ f_cse_preamble_dau_master(v_ae1Index, v_acpIndex);//Configure aux AE1 and create ACP
var template RequestPrimitive v_createRequest1 := m_createDynamicAuthorizationConsultationBase(omit, true); //dynamicAuthorizationEnable set to TRUE
v_createRequest1.primitiveContent.dynamicAuthorizationConsultation.dynamicAuthorizationPoA := {f_getResourceAddress(v_dasIndex)};
@@ -12188,8 +12188,8 @@ module OneM2M_Testcases_CSE_Release_3 {
v_containerIndex := f_cse_createResource(int3, v_createRequest2, -1);
// Test Body
- vc_ae2.start(f_cse_retrieveResource(v_containerIndex));
- f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
+ vc_ae1.start(f_cse_retrieveResource(v_containerIndex));
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae1);
tc_ac.start;
alt {
@@ -12208,7 +12208,7 @@ module OneM2M_Testcases_CSE_Release_3 {
} else {
setverdict(fail, __SCOPE__ & ": SecurityInfoType element is not set to '1' (Dynamic Authorization Request)");
}
- if(f_compareURIs(v_ae2Index, vc_request.primitive.requestPrimitive.primitiveContent.securityInfo.dasRequest.originator)) {
+ if(f_compareURIs(v_ae1Index, vc_request.primitive.requestPrimitive.primitiveContent.securityInfo.dasRequest.originator)) {
setverdict(pass, __SCOPE__ & ": Originator element set to the ID of the originator of the received request");
} else {
setverdict(fail, __SCOPE__ & ": Originator element not set to the ID of the originator of the received request");
@@ -12244,10 +12244,10 @@ module OneM2M_Testcases_CSE_Release_3 {
*/
testcase TC_CSE_DAU_NTF_002() runs on Tester system CseSystem {
//Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ var AeSimu v_das := AeSimu.create("AE1") alive;
- v_ae1.start(f_CSE_DAU_NTF_002());
- v_ae1.done;
+ v_das.start(f_CSE_DAU_NTF_002());
+ v_das.done;
}
@@ -12256,7 +12256,7 @@ module OneM2M_Testcases_CSE_Release_3 {
//Local variables
var ResponsePrimitive v_notificationResponse;
var integer v_dasIndex := -1;
- var integer v_ae2Index := -1;
+ var integer v_ae1Index := -1;
var integer v_containerIndex, v_acpIndex := -1;
var integer v_dynamicAuthorizationConsultationIndex := -1;
@@ -12277,7 +12277,7 @@ module OneM2M_Testcases_CSE_Release_3 {
// Preamble
v_dasIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_dau_master(v_ae2Index, v_acpIndex);//Configure aux AE2 and create ACP
+ f_cse_preamble_dau_master(v_ae1Index, v_acpIndex);//Configure aux AE1 and create ACP
var template RequestPrimitive v_createRequest1 := m_createDynamicAuthorizationConsultationBase(omit, true); //dynamicAuthorizationEnable set to TRUE
v_createRequest1.primitiveContent.dynamicAuthorizationConsultation.dynamicAuthorizationPoA := {f_getResourceAddress(v_dasIndex)};
@@ -12289,8 +12289,8 @@ module OneM2M_Testcases_CSE_Release_3 {
v_containerIndex := f_cse_createResource(int3, v_createRequest2, -1);
// Test Body
- vc_ae2.start(f_cse_retrieveResource(v_containerIndex));
- f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
+ vc_ae1.start(f_cse_retrieveResource(v_containerIndex));
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae1);
tc_ac.start;
alt {
@@ -12309,7 +12309,7 @@ module OneM2M_Testcases_CSE_Release_3 {
} else {
setverdict(fail, __SCOPE__ & ": SecurityInfoType element is not set to '1' (Dynamic Authorization Request)");
}
- if(f_compareURIs(v_ae2Index, vc_request.primitive.requestPrimitive.primitiveContent.securityInfo.dasRequest.originator)) {
+ if(f_compareURIs(v_ae1Index, vc_request.primitive.requestPrimitive.primitiveContent.securityInfo.dasRequest.originator)) {
setverdict(pass, __SCOPE__ & ": Originator element set to the ID of the originator of the received request");
} else {
setverdict(fail, __SCOPE__ & ": Originator element not set to the ID of the originator of the received request");
@@ -12543,7 +12543,7 @@ module OneM2M_Testcases_CSE_Release_3 {
//Local variables
var RequestPrimitive v_notificationRequest;
var integer v_dasIndex := -1;
- var integer v_ae2Index := -1;
+ var integer v_ae1Index := -1;
var integer v_containerIndex, v_acpIndex := -1;
var integer v_dynamicAuthorizationConsultationIndex := -1;
var template PrimitiveContent v_contentResponse;
@@ -12564,7 +12564,7 @@ module OneM2M_Testcases_CSE_Release_3 {
// Test adapter configuration
// Preamble
- v_ae2Index := f_cse_preamble_registerAe();
+ v_ae1Index := f_cse_preamble_registerAe();
v_acpIndex := f_cse_preamble_createAcpAux(-, int61); //c_CUDNDi), no resource retrieval privilege
var template RequestPrimitive v_createRequest1 := m_createDynamicAuthorizationConsultationBase(omit, true); //dynamicAuthorizationEnable set to TRUE
@@ -12626,7 +12626,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var AccessControlOperations v_grantedPrivileges := int61;
var Timestamp v_privilegesLifetime := "21001231T012345";
var integer v_dasIndex := -1;
- var integer v_ae2Index := -1;
+ var integer v_ae1Index := -1;
var integer v_containerIndex, v_acpIndex := -1;
var integer v_dynamicAuthorizationConsultationIndex := -1;
@@ -12646,7 +12646,7 @@ module OneM2M_Testcases_CSE_Release_3 {
// Test adapter configuration
// Preamble
- v_ae2Index := f_cse_preamble_registerAe();
+ v_ae1Index := f_cse_preamble_registerAe();
v_acpIndex := f_cse_preamble_createAcpAux(-, int61); //c_CUDNDi), no resource retrieval privilege
var template RequestPrimitive v_createRequest1 := m_createDynamicAuthorizationConsultationBase(omit, true); //dynamicAuthorizationEnable set to TRUE
@@ -12679,7 +12679,7 @@ module OneM2M_Testcases_CSE_Release_3 {
f_aeSimu_checkComponentDoneAndGetVerdict(vc_das);
- v_request := valueof(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_ae2Index)));
+ v_request := valueof(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_ae1Index)));
v_request.resultContent := int8;//Child resources
f_send(e_mcaPort, m_request(v_request));
v_contentResponse2.accessControlPolicy := mw_contentAcp_any;
@@ -12759,7 +12759,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var template PrimitiveContent v_contentResponse;
var DynAuthJWT v_token;
var integer v_dasIndex := -1;
- var integer v_ae2Index := -1;
+ var integer v_ae1Index := -1;
var integer v_containerIndex, v_acpIndex := -1;
var integer v_dynamicAuthorizationConsultationIndex := -1;
@@ -12779,7 +12779,7 @@ module OneM2M_Testcases_CSE_Release_3 {
// Test adapter configuration
// Preamble
- v_ae2Index := f_cse_preamble_registerAe();
+ v_ae1Index := f_cse_preamble_registerAe();
v_acpIndex := f_cse_preamble_createAcpAux(-, int61); //c_CUDNDi), no resource retrieval privilege
var template RequestPrimitive v_createRequest1 := m_createDynamicAuthorizationConsultationBase(omit, true); //dynamicAuthorizationEnable set to TRUE
@@ -12840,7 +12840,7 @@ module OneM2M_Testcases_CSE_Release_3 {
//Local variables
var RequestPrimitive v_notificationRequest;
var integer v_dasIndex := -1;
- var integer v_ae2Index := -1;
+ var integer v_ae1Index := -1;
var integer v_containerIndex, v_acpIndex := -1;
var integer v_dynamicAuthorizationConsultationIndex := -1;
@@ -12860,7 +12860,7 @@ module OneM2M_Testcases_CSE_Release_3 {
// Test adapter configuration
// Preamble
- v_ae2Index := f_cse_preamble_registerAe();
+ v_ae1Index := f_cse_preamble_registerAe();
v_acpIndex := f_cse_preamble_createAcpAux(-, int61); //c_CUDNDi), no resource retrieval privilege
var template RequestPrimitive v_createRequest1 := m_createDynamicAuthorizationConsultationBase(omit, true); //dynamicAuthorizationEnable set to TRUE