From 93b627962b8b4858393826d9cacf09e6bedffbdb Mon Sep 17 00:00:00 2001 From: reinaortega <miguelangel.reinaortega@etsi.org> Date: Thu, 21 Feb 2019 14:14:14 +0100 Subject: [PATCH] Small corrections to REG test cases where From is set to "S" Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org> --- LibOneM2M/OneM2M_Functions.ttcn | 3 ++- LibOneM2M/OneM2M_Templates.ttcn | 2 +- OneM2M_Testcases_CSE_Release_1.ttcn | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn index 8c7e86d..946e4d1 100644 --- a/LibOneM2M/OneM2M_Functions.ttcn +++ b/LibOneM2M/OneM2M_Functions.ttcn @@ -2585,7 +2585,8 @@ module OneM2M_Functions { v_myResource.cSEBase.supportedResourceType := PX_CSE1_SRT; v_myResource.cSEBase.pointOfAccess := {f_getCompletePoA(PX_PROTOCOL_BINDING_CSE1, PX_CSE1_ADDRESS, "")}; v_myResource.cSEBase.cseType := vc_cseType; - + v_myResource.cSEBase.supportedReleaseVersions := {"2a"}; + }else if(p_resourceType == int16 and ispresent(p_resource)) { //RemoteCSE if(ischosen(p_resource.remoteCSE)){ v_myResource.remoteCSE := valueof(p_resource.remoteCSE); diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn index 43d2eaf..f5da459 100644 --- a/LibOneM2M/OneM2M_Templates.ttcn +++ b/LibOneM2M/OneM2M_Templates.ttcn @@ -797,7 +797,7 @@ module OneM2M_Templates { * @desc Reception template for CREATE AEAnnc for registration when AE-ID-Stem starts with S */ template RequestPrimitive mw_createAEAnnc_s_ae_id(template XSD.ID p_from := ?, template XSD.ID p_to := ?, template AcpType p_accessControlPolicyIds := ?, template XSD.AnyURI p_link := ?) modifies mw_create := { - primitiveContent := {aEAnnc := mw_contentCreateAEAnnc({"Credential-ID:None"}, p_accessControlPolicyIds)} + primitiveContent := {aEAnnc := mw_contentCreateAEAnnc({"Credential-ID:None"}, p_accessControlPolicyIds, p_link)} }; /** diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn index 0b54f8a..bc51911 100644 --- a/OneM2M_Testcases_CSE_Release_1.ttcn +++ b/OneM2M_Testcases_CSE_Release_1.ttcn @@ -690,11 +690,12 @@ module OneM2M_Testcases_CSE_Release_1 { var MsgIn v_request; var template RequestPrimitive v_requestPrimitive; + template XSD.AnyURI v_link := pattern "/?*"; //Test control // Test component configuration - f_cf02UpCseSimuMaster(); + f_cf02UpCseSimuMaster(int1); //Preamble vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE); @@ -702,7 +703,7 @@ module OneM2M_Testcases_CSE_Release_1 { //Test Body vc_ae1.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, "S"))); - v_requestPrimitive := mw_createAEAnnc_s_ae_id(PX_CSE_ID & "/S", -, -, -); + v_requestPrimitive := mw_createAEAnnc_s_ae_id(PX_CSE_ID & "/S", -, -, PX_CSE_ID & v_link); v_requestPrimitive.primitiveContent.aEAnnc.app_ID := PX_APP_ID; tc_ac.start; -- GitLab