diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn index 70ae6cfae6ca435f790a6d9689027aec8a1eb7ce..57089edf4aa467192ec6b25164167188ac4c09a1 100644 --- a/LibOneM2M/OneM2M_Functions.ttcn +++ b/LibOneM2M/OneM2M_Functions.ttcn @@ -1029,11 +1029,6 @@ module OneM2M_Functions { setverdict(inconc, __SCOPE__&":INFO: Error while registering application"); stop; } - [] mcaPort.receive { - tc_ac.stop; - setverdict(inconc, __SCOPE__&":INFO: Unexpected message received"); - stop; - }; [] tc_ac.timeout { setverdict(inconc, __SCOPE__&":INFO: No answer while registering resource"); stop; diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn index 88f7f65f1e5b94d952c144c590828c1439b483f3..0afa59589b24d383fb8fc5adb966609538e2f56e 100644 --- a/OneM2M_PermutationFunctions.ttcn +++ b/OneM2M_PermutationFunctions.ttcn @@ -7675,6 +7675,7 @@ module OneM2M_PermutationFunctions { // Local variables var MsgIn v_response; var integer v_aeIndex := -1; + var integer v_aeIndex2 := -1; var integer v_acpIndex := -1; var RequestPrimitive v_createRequest := valueof(m_createAcpBase); var RequestPrimitive v_updateRequest; @@ -7684,14 +7685,19 @@ module OneM2M_PermutationFunctions { // Test control // Test component configuration - f_cf01Up(); + f_cf01Up(true); // Test adapter configuration // Preamble v_acpIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpIndex].resource)}, -); - + + vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_TS_AE2.appId, -, PX_TS_AE2.aeIdStem, c_defaultAe2ResourceName, -), -1)); // AE2 is registred + f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2); + + v_aeIndex2 := f_getLatestResource(vc_ae2); + v_accessControlRule_1 := valueof(m_createAcr({ f_getOriginator(v_aeIndex), PX_SUPER_AE_ID}, int63)); v_setOfArcs.accessControlRule_list := {v_accessControlRule_1}; v_updateRequest := valueof(m_updateAcpPrivileges(v_setOfArcs, v_setOfArcs)); @@ -7699,7 +7705,7 @@ module OneM2M_PermutationFunctions { // Test Body p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex); - p_requestPrimitive.from_ := "UnknowOriginator"; + p_requestPrimitive.from_ := f_getResourceId(vc_resourcesList[v_aeIndex2].resource); p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000); f_send(e_mca_port, m_request(valueof(p_requestPrimitive))); @@ -7881,13 +7887,14 @@ module OneM2M_PermutationFunctions { // Local variables var MsgIn v_response; var integer v_aeIndex := -1; + var integer v_aeIndex2 := -1; var integer v_acpIndex := -1; var RequestPrimitive v_createRequest; // Test control // Test component configuration - f_cf01Up(); + f_cf01Up(true); // Test adapter configuration @@ -7897,9 +7904,14 @@ module OneM2M_PermutationFunctions { v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpIndex].resource)}, -); + vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_TS_AE2.appId, -, PX_TS_AE2.aeIdStem, c_defaultAe2ResourceName, -), -1)); // AE2 is registred + f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2); + + v_aeIndex2 := f_getLatestResource(vc_ae2); + // Test Body p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex); - p_requestPrimitive.from_ := "UnknowOriginator"; + p_requestPrimitive.from_ := f_getResourceId(vc_resourcesList[v_aeIndex2].resource); p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000); f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));