diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 992d5dea62bd5f23daa4ca37ce848c2964027bbe..3fc5d281924924ad64a1ed5566eb7d48f9512026 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -6296,9 +6296,7 @@ module OneM2M_Templates {
choice := {childResource_list := ?} //O
}
- template AccessControlPolicy_optional mw_contentAcp_rc6 modifies mw_contentAcp_allOmit := {
- choice := {childResource_list := ?} //O
- }
+ template ResourceRefList mw_contentAcp_rc6 := {resourceRef_list := ? };//O
template AccessControlPolicy_optional mw_contentAcp_rc7 modifies mw_contentAcpBase := {
@@ -6429,9 +6427,7 @@ module OneM2M_Templates {
choice := {childResource_list := ?} //O
}
- template Group_optional mw_contentGroup_rc6 modifies mw_contentGroup_allOmit := {
- choice := {childResource_list := ?} //O
- }
+ template ResourceRefList mw_contentGroup_rc6 := {resourceRef_list := ? };//O
template Group_optional mw_contentGroup_rc7 modifies mw_contentGroupBase := {
@@ -6542,13 +6538,14 @@ module OneM2M_Templates {
template PollingChannel_optional mw_contentPollingChannel_rc5 modifies mw_contentPollingChannelBase := {
}
- template PollingChannel_optional mw_contentPollingChannel_rc6 modifies mw_contentPollingChannel_allOmit := {
- choice := {childResource_list := ?} //O
- }
+ template ResourceRefList mw_contentPollingChannel_rc6 := {resourceRef_list := ? };//O
- template PollingChannel_optional mw_contentPollingChannel_rc8 modifies mw_contentPollingChannel_allOmit := {
- choice := {choice_list := ?} //O
- }
+ //Temporarily pollingChannel resource with child resources will contain nothing as no child resource can be used
+ //template PollingChannel_optional mw_contentPollingChannel_rc8 modifies mw_contentPollingChannel_allOmit := {
+ // choice := {choice_list := ?} //O
+ //}
+
+ template PollingChannel_optional mw_contentPollingChannel_rc8 := mw_contentPollingChannel_allOmit;
template (value) RemoteCSE_optional m_contentRemoteCSE_allOmit := {
resourceName := omit,//M
@@ -6744,9 +6741,7 @@ module OneM2M_Templates {
choice := {childResource_list := ?} //O
}
- template Schedule_optional mw_contentSchedule_rc6 modifies mw_contentSchedule_allOmit := {
- choice := {childResource_list := ?} //O
- }
+ template ResourceRefList mw_contentSchedule_rc6 := {resourceRef_list := ? };//O
template Schedule_optional mw_contentSchedule_rc7 modifies mw_contentScheduleBase := {
@@ -6937,9 +6932,7 @@ module OneM2M_Templates {
choice := {childResource_list := ?} //O
}
- template Subscription_optional mw_contentSubscription_rc6 modifies mw_contentSubscription_allOmit := {
- choice := {childResource_list := ?} //O
- }
+ template ResourceRefList mw_contentSubscription_rc6 := {resourceRef_list := ? };//O
template Subscription_optional mw_contentSubscription_rc7 modifies mw_contentSubscriptionBase := {
@@ -7134,9 +7127,7 @@ module OneM2M_Templates {
choice := {childResource_list := ?} //O
}
- template Container_optional mw_contentContainer_rc6 modifies mw_contentContainer_allOmit := {
- choice := {childResource_list := ?} //O
- }
+ template ResourceRefList mw_contentContainer_rc6 := {resourceRef_list := ? };//O
template Container_optional mw_contentContainer_rc7 modifies mw_contentContainerBase := {
@@ -7384,9 +7375,7 @@ module OneM2M_Templates {
choice := {childResource_list := ?} //O
}
- template TimeSeries_optional mw_contentTimeSeries_rc6 modifies mw_contentTimeSeries_allOmit := {
- choice := {childResource_list := ?} //O
- }
+ template ResourceRefList mw_contentTimeSeries_rc6 := {resourceRef_list := ? };//O
template TimeSeries_optional mw_contentTimeSeries_rc8 modifies mw_contentTimeSeries_allOmit := {
choice := {choice_list := ?} //O
diff --git a/OneM2M_Testcases_CSE_Release_3.ttcn b/OneM2M_Testcases_CSE_Release_3.ttcn
index 60fe8be2b2cd0bb5d39c259af80819fcf1d487f8..55b9dbdd9451898791b8089af9a582455567309c 100644
--- a/OneM2M_Testcases_CSE_Release_3.ttcn
+++ b/OneM2M_Testcases_CSE_Release_3.ttcn
@@ -3212,7 +3212,7 @@ module OneM2M_Testcases_CSE_Release_3 {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
- v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
+ v_contentResponse.pollingChannel := mw_contentPollingChannel_rc5;
v_ae1.start(f_CSE_DMR_RET_023(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
v_ae1.done;
@@ -3264,7 +3264,7 @@ module OneM2M_Testcases_CSE_Release_3 {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
- v_contentResponse.container := mw_contentContainer_rc6;
+ v_contentResponse.resourceRefList := mw_contentContainer_rc6;
v_ae1.start(f_CSE_DMR_RET_024(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
v_ae1.done;
@@ -3274,7 +3274,7 @@ module OneM2M_Testcases_CSE_Release_3 {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
- v_contentResponse.group_ := mw_contentGroup_rc6;
+ v_contentResponse.resourceRefList := mw_contentGroup_rc6;
v_ae1.start(f_CSE_DMR_RET_024(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
v_ae1.done;
@@ -3284,7 +3284,7 @@ module OneM2M_Testcases_CSE_Release_3 {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
- v_contentResponse.accessControlPolicy := mw_contentAcp_rc6;
+ v_contentResponse.resourceRefList := mw_contentAcp_rc6;
v_ae1.start(f_CSE_DMR_RET_024(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
v_ae1.done;
@@ -3294,7 +3294,7 @@ module OneM2M_Testcases_CSE_Release_3 {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
- v_contentResponse.subscription := mw_contentSubscription_rc6;
+ v_contentResponse.resourceRefList := mw_contentSubscription_rc6;
v_ae1.start(f_CSE_DMR_RET_024(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
v_ae1.done;
@@ -3305,7 +3305,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
- v_contentResponse.schedule := mw_contentSchedule_rc6;
+ v_contentResponse.resourceRefList := mw_contentSchedule_rc6;
v_ae1.start(f_CSE_DMR_RET_024(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase));//Schedule
v_ae1.done;
@@ -3317,7 +3317,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
- v_contentResponse.pollingChannel := mw_contentPollingChannel_rc6;
+ v_contentResponse.resourceRefList := mw_contentPollingChannel_rc6;
v_ae1.start(f_CSE_DMR_RET_024(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
v_ae1.done;
@@ -3329,7 +3329,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var template PrimitiveContent v_contentResponse;
- v_contentResponse.timeSeries := mw_contentTimeSeries_rc6;
+ v_contentResponse.resourceRefList := mw_contentTimeSeries_rc6;
v_ae1.start(f_CSE_DMR_RET_024(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries
v_ae1.done;
@@ -6059,7 +6059,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
- v_contentResponse.container := mw_contentContainer_rc6;
+ v_contentResponse.resourceRefList := mw_contentContainer_rc6;
v_ae1.start(f_CSE_DMR_DEL_016(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
v_ae1.done;
@@ -6070,7 +6070,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
- v_contentResponse.group_ := mw_contentGroup_rc6;
+ v_contentResponse.resourceRefList := mw_contentGroup_rc6;
v_ae1.start(f_CSE_DMR_DEL_016(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
v_ae1.done;
@@ -6081,7 +6081,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
- v_contentResponse.accessControlPolicy := mw_contentAcp_rc6;
+ v_contentResponse.resourceRefList := mw_contentAcp_rc6;
v_ae1.start(f_CSE_DMR_DEL_016(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
v_ae1.done;
@@ -6092,7 +6092,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
- v_contentResponse.schedule := mw_contentSchedule_rc6;
+ v_contentResponse.resourceRefList := mw_contentSchedule_rc6;
v_ae1.start(f_CSE_DMR_DEL_016(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase));//Schedule
v_ae1.done;
@@ -6104,7 +6104,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
- v_contentResponse.pollingChannel := mw_contentPollingChannel_rc6;
+ v_contentResponse.resourceRefList := mw_contentPollingChannel_rc6;
v_ae1.start(f_CSE_DMR_DEL_016(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
v_ae1.done;
@@ -6115,7 +6115,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
- v_contentResponse.subscription := mw_contentSubscription_rc6;
+ v_contentResponse.resourceRefList := mw_contentSubscription_rc6;
v_ae1.start(f_CSE_DMR_DEL_016(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
v_ae1.done;
@@ -6126,7 +6126,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
- v_contentResponse.timeSeries := mw_contentTimeSeries_rc6;
+ v_contentResponse.resourceRefList := mw_contentTimeSeries_rc6;
v_ae1.start(f_CSE_DMR_DEL_016(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries
v_ae1.done;