diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index b1834dd9ff83a93afea668cdf932caa8e5f82ddd..1cffd0cc0b2175baa8aaa32dcc6b7ff596a72952 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -6200,8 +6200,8 @@ module OneM2M_Templates {
choice := {childResource_list := ?} //O
}
- template PrimitiveContent mw_contentAcp_rc6 := {
- resourceRefList := ?
+ template AccessControlPolicy_optional mw_contentAcp_rc6 modifies mw_contentAcp_allOmit := {
+ choice := {childResource_list := ?} //O
}
template AccessControlPolicy_optional mw_contentAcp_rc7 modifies mw_contentAcpBase := {
@@ -6315,8 +6315,8 @@ module OneM2M_Templates {
choice := {childResource_list := ?} //O
}
- template PrimitiveContent mw_contentGroup_rc6 := {
- resourceRefList := ?
+ template Group_optional mw_contentGroup_rc6 modifies mw_contentGroup_allOmit := {
+ choice := {childResource_list := ?} //O
}
template Group_optional mw_contentGroup_rc7 modifies mw_contentGroupBase := {
@@ -6402,8 +6402,8 @@ module OneM2M_Templates {
template PollingChannel_optional mw_contentPollingChannel_rc5 modifies mw_contentPollingChannelBase := {
}
- template PrimitiveContent mw_contentPollingChannel_rc6 := {
- resourceRefList := ?
+ template PollingChannel_optional mw_contentPollingChannel_rc6 modifies mw_contentPollingChannel_allOmit := {
+ choice := {childResource_list := ?} //O
}
template PollingChannel_optional mw_contentPollingChannel_rc8 modifies mw_contentPollingChannel_allOmit := {
@@ -6604,8 +6604,8 @@ module OneM2M_Templates {
choice := {childResource_list := ?} //O
}
- template PrimitiveContent mw_contentSchedule_rc6 := {
- resourceRefList := ?
+ template Schedule_optional mw_contentSchedule_rc6 modifies mw_contentSchedule_allOmit := {
+ choice := {childResource_list := ?} //O
}
template Schedule_optional mw_contentSchedule_rc7 modifies mw_contentScheduleBase := {
@@ -6797,8 +6797,8 @@ module OneM2M_Templates {
choice := {childResource_list := ?} //O
}
- template PrimitiveContent mw_contentSubscription_rc6 := {
- resourceRefList := ?
+ template Subscription_optional mw_contentSubscription_rc6 modifies mw_contentSubscription_allOmit := {
+ choice := {childResource_list := ?} //O
}
template Subscription_optional mw_contentSubscription_rc7 modifies mw_contentSubscriptionBase := {
@@ -6975,8 +6975,8 @@ module OneM2M_Templates {
choice := {childResource_list := ?} //O
}
- template PrimitiveContent mw_contentContainer_rc6 := {
- resourceRefList := ?
+ template Container_optional mw_contentContainer_rc6 modifies mw_contentContainer_allOmit := {
+ choice := {childResource_list := ?} //O
}
template Container_optional mw_contentContainer_rc7 modifies mw_contentContainerBase := {
@@ -7191,8 +7191,8 @@ module OneM2M_Templates {
choice := {childResource_list := ?} //O
}
- template PrimitiveContent mw_contentTimeSeries_rc6 := {
- resourceRefList := ?
+ template TimeSeries_optional mw_contentTimeSeries_rc6 modifies mw_contentTimeSeries_allOmit := {
+ choice := {childResource_list := ?} //O
}
template TimeSeries_optional mw_contentTimeSeries_rc8 modifies mw_contentTimeSeries_allOmit := {
diff --git a/OneM2M_Testcases_CSE_Release_3.ttcn b/OneM2M_Testcases_CSE_Release_3.ttcn
index c832d0c418c6813bfa6e3e7806ed23f20e45f453..1e01a4ba13e77c45449d90e52ffc12f3f6bd5c2f 100644
--- a/OneM2M_Testcases_CSE_Release_3.ttcn
+++ b/OneM2M_Testcases_CSE_Release_3.ttcn
@@ -3285,7 +3285,7 @@ module OneM2M_Testcases_CSE_Release_3 {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
- v_contentResponse:= mw_contentContainer_rc6;
+ v_contentResponse.container := mw_contentContainer_rc6;
v_ae1.start(f_CSE_DMR_RET_024(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
v_ae1.done;
@@ -3295,7 +3295,7 @@ module OneM2M_Testcases_CSE_Release_3 {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
- v_contentResponse := mw_contentGroup_rc6;
+ v_contentResponse.group_ := mw_contentGroup_rc6;
v_ae1.start(f_CSE_DMR_RET_024(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
v_ae1.done;
@@ -3305,7 +3305,7 @@ module OneM2M_Testcases_CSE_Release_3 {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
- v_contentResponse := mw_contentAcp_rc6;
+ v_contentResponse.accessControlPolicy := mw_contentAcp_rc6;
v_ae1.start(f_CSE_DMR_RET_024(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
v_ae1.done;
@@ -3315,7 +3315,7 @@ module OneM2M_Testcases_CSE_Release_3 {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
- v_contentResponse := mw_contentSubscription_rc6;
+ v_contentResponse.subscription := mw_contentSubscription_rc6;
v_ae1.start(f_CSE_DMR_RET_024(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
v_ae1.done;
@@ -3326,7 +3326,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
- v_contentResponse := mw_contentSchedule_rc6;
+ v_contentResponse.schedule := mw_contentSchedule_rc6;
v_ae1.start(f_CSE_DMR_RET_024(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase));//Schedule
v_ae1.done;
@@ -3338,7 +3338,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
- v_contentResponse := mw_contentPollingChannel_rc6;
+ v_contentResponse.pollingChannel := mw_contentPollingChannel_rc6;
v_ae1.start(f_CSE_DMR_RET_024(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
v_ae1.done;
@@ -3350,7 +3350,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var template PrimitiveContent v_contentResponse;
- v_contentResponse := mw_contentTimeSeries_rc6;
+ v_contentResponse.timeSeries := mw_contentTimeSeries_rc6;
v_ae1.start(f_CSE_DMR_RET_024(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries
v_ae1.done;
@@ -6033,7 +6033,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
- v_contentResponse := mw_contentContainer_rc6;
+ v_contentResponse.container := mw_contentContainer_rc6;
v_ae1.start(f_CSE_DMR_DEL_016(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
v_ae1.done;
@@ -6044,7 +6044,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
- v_contentResponse := mw_contentGroup_rc6;
+ v_contentResponse.group_ := mw_contentGroup_rc6;
v_ae1.start(f_CSE_DMR_DEL_016(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
v_ae1.done;
@@ -6055,7 +6055,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
- v_contentResponse := mw_contentAcp_rc6;
+ v_contentResponse.accessControlPolicy := mw_contentAcp_rc6;
v_ae1.start(f_CSE_DMR_DEL_016(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
v_ae1.done;
@@ -6066,7 +6066,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
- v_contentResponse := mw_contentSchedule_rc6;
+ v_contentResponse.schedule := mw_contentSchedule_rc6;
v_ae1.start(f_CSE_DMR_DEL_016(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase));//Schedule
v_ae1.done;
@@ -6078,7 +6078,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
- v_contentResponse := mw_contentPollingChannel_rc6;
+ v_contentResponse.pollingChannel := mw_contentPollingChannel_rc6;
v_ae1.start(f_CSE_DMR_DEL_016(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
v_ae1.done;
@@ -6089,7 +6089,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
- v_contentResponse := mw_contentSubscription_rc6;
+ v_contentResponse.subscription := mw_contentSubscription_rc6;
v_ae1.start(f_CSE_DMR_DEL_016(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
v_ae1.done;
@@ -6100,7 +6100,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
- v_contentResponse := mw_contentTimeSeries_rc6;
+ v_contentResponse.timeSeries := mw_contentTimeSeries_rc6;
v_ae1.start(f_CSE_DMR_DEL_016(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries
v_ae1.done;