diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn index f73880d5e3d33d8d538e9001a235cd88b6a8ca38..22c64e0366476d6ed1bc023b5853c90216dd5d68 100644 --- a/LibOneM2M/OneM2M_Functions.ttcn +++ b/LibOneM2M/OneM2M_Functions.ttcn @@ -681,7 +681,7 @@ module OneM2M_Functions { function f_cse_preamble_subscriptionVerification(inout integer p_ae2Index, inout template RequestPrimitive p_createRequestPrimitive,in ResourceType p_resourceType, in ResponseStatusCode p_responseStatusCode := int2000) runs on AeSimu { if(p_resourceType == int23){ - vc_ae2.start(f_cse_preamble_createAcpAux(-, int63)); + vc_ae2.start(f_cse_createAccessControlPolicyAux("SubscriptionVerificationAcp",{"all"}, int63)); vc_ae2.done; vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, {f_getAnnouncementTargetPoA("HTTP", PX_AE2_ADDRESS, "")}), -1)); // AE2 is registred vc_ae2.done; @@ -941,7 +941,7 @@ module OneM2M_Functions { function f_cse_createAccessControlPolicyAux(in template (value) XSD.String p_acpName := c_acpAuxName, in template (value) ListOfURIs p_acor := PX_ACOR, in template (value) AccessControlOperations p_allowedOperations := int63) runs on AeSimu return integer{ var RequestPrimitive v_request; var integer v_acpAuxIndex := -1; - v_request := valueof(m_createAcpAux(p_acpName := p_acpName, p_allowedOperations := p_allowedOperations)); + v_request := valueof(m_createAcpAux(p_acpName := p_acpName, p_acor := p_acor, p_allowedOperations := p_allowedOperations)); v_request := f_getCreateRequestPrimitive(int1, v_request, -1); diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn index 2e89e7c08c5b625703a6ce22e13146d786d4824c..e4bdd37ecd44befc0c81ee631c54102960aeec3b 100644 --- a/OneM2M_PermutationFunctions.ttcn +++ b/OneM2M_PermutationFunctions.ttcn @@ -1795,7 +1795,7 @@ module OneM2M_PermutationFunctions { if(ispresent(p_parentRequestPrimitive)) { if(match(int23, p_parentRequestPrimitive.resourceType)){ - vc_ae2.start(f_cse_preamble_createAcpAux(-, int63)); + vc_ae2.start(f_cse_preamble_createAcpAux("SubscriptionVerificationAcp", int63)); vc_ae2.done; vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, v_poaList), -1)); // AE2 is registred vc_ae2.done; @@ -1832,7 +1832,7 @@ module OneM2M_PermutationFunctions { // Test Body if(match(int23, p_requestPrimitive.resourceType)){ - vc_ae2.start(f_cse_preamble_createAcpAux(-, int63)); + vc_ae2.start(f_cse_preamble_createAcpAux("SubscriptionVerificationAcp", int63)); vc_ae2.done; vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, v_poaList), -1)); // AE2 is registred vc_ae2.done; @@ -1906,7 +1906,7 @@ module OneM2M_PermutationFunctions { vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase); if(match(int23, p_resourceType)){ - vc_ae1.start(f_cse_preamble_createAcpAux(-, int63)); + vc_ae1.start(f_cse_preamble_createAcpAux("SubscriptionVerificationAcp", int63)); vc_ae1.done; vc_ae1.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM, "MyAe", v_poaList), -1)); // AE1 is registered vc_ae1.done;