diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn index 35b953f1824848c249a3b4fe35059986c2537a33..6431beaef847691e7892709a24cd1e079f9a31a4 100644 --- a/LibOneM2M/OneM2M_Templates.ttcn +++ b/LibOneM2M/OneM2M_Templates.ttcn @@ -632,7 +632,6 @@ module OneM2M_Templates { }; template RequestPrimitive mw_updateAEAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_update:= { - requestIdentifier := testcasename() & "-m_updateAEAnnc", primitiveContent := {aEAnnc := ?} }; @@ -3753,7 +3752,32 @@ module OneM2M_Templates { supportedReleaseVersions := ?,//M choice := *//O }; - + + template AEAnnc_optional mw_contentAeAnnc_any := { + resourceName := *,//M + resourceType := *,//M + resourceID := *,//M + parentID := *,//M + creationTime := *,//M + lastModifiedTime := *,//M + labels := *,//O + accessControlPolicyIDs := *,//O + expirationTime := *,//M + link := *,//M, + dynamicAuthorizationConsultationIDs := *, //O + appName := *,//O + app_ID := *,//M + aE_ID := *,//M + pointOfAccess := *,//O + ontologyRef := *,//O + nodeLink := *,//O + requestReachability := *,//M + contentSerialization := *,//O + e2eSecInfo:= *, //O + supportedReleaseVersions := ?,//M + choice := *//O + }; + template AccessControlPolicy_optional mw_contentAcpBase := { resourceName := ?,//M resourceType := ?,//M diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn index 629f4d6a58e477be23e2b49e4228942e3780c705..ca083174085fcbfb3075b6a5fbf7b0e07f7b6f4c 100644 --- a/OneM2M_Testcases_CSE_Release_1.ttcn +++ b/OneM2M_Testcases_CSE_Release_1.ttcn @@ -899,6 +899,7 @@ module OneM2M_Testcases_CSE_Release_1 { function f_CSE_REG_CRE_008() runs on CseSimu { var RequestPrimitive v_request; + var template RequestPrimitive v_updateAeAnnc := mw_updateAEAnnc; var integer v_cseBaseIndex := -1; var integer v_aeIndex := -1; var integer v_aeIndex_ae1 := -1; @@ -929,7 +930,8 @@ module OneM2M_Testcases_CSE_Release_1 { vc_ae1.start(f_cse_deleteResource(v_aeIndex_ae1)); - f_cse_announcementProcedure_updateHandler(mw_updateAEAnnc, -, v_aeAnncIndex); + v_updateAeAnnc.primitiveContent.aEAnnc.link := "INACTIVE"; + f_cse_announcementProcedure_updateHandler(v_updateAeAnnc, -, v_aeAnncIndex); f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);