From d677ba529b692d9457d44e98c73b0c9a1f99b13b Mon Sep 17 00:00:00 2001 From: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org> Date: Thu, 5 Sep 2024 11:11:01 +0200 Subject: [PATCH] Fix for schedule resource name under subscription resource --- LibOneM2M/OneM2M_Templates.ttcn | 9 +++++++++ OneM2M_Testcases_CSE_Release_2.ttcn | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn index c7775c9..32cc27e 100644 --- a/LibOneM2M/OneM2M_Templates.ttcn +++ b/LibOneM2M/OneM2M_Templates.ttcn @@ -1167,6 +1167,15 @@ module OneM2M_Templates { primitiveContent := {schedule := m_contentCreateSchedule ({{"* * * * * * *"}})} }; + /** + * @desc Base CREATE request primitive for Schedule resource + */ + template (value) RequestPrimitive m_createScheduleBase_subscription modifies m_create := { + requestIdentifier := testcasename() & "-m_createSchedule", + resourceType := int18, + primitiveContent := {schedule := m_contentCreateSchedule ({{"* * * * * * *"}}, "notificationSchedule")} + }; + template (value) RequestPrimitive m_createSchedule(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_name, in template (value) ScheduleEntries p_scheduleElement ) modifies m_create := { to_ := p_parentResourceAddress, requestIdentifier := testcasename() & "-m_createSchedule", diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn index 8d842ba..0cf1d47 100644 --- a/OneM2M_Testcases_CSE_Release_2.ttcn +++ b/OneM2M_Testcases_CSE_Release_2.ttcn @@ -1133,7 +1133,7 @@ module OneM2M_Testcases_CSE_Release_2 { var template PrimitiveContent v_contentResponse; v_contentResponse.subscription := mw_contentSubscription_rc1; - v_ae1.start(f_CSE_DMR_RET_021(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription + v_ae1.start(f_CSE_DMR_RET_021(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase_subscription));//Subscription v_ae1.done; } -- GitLab