diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index e127875014ff7623ec5e51e41096f322ffa4fa56..b1834dd9ff83a93afea668cdf932caa8e5f82ddd 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -6200,20 +6200,8 @@ module OneM2M_Templates {
choice := {childResource_list := ?} //O
}
- template AccessControlPolicy_optional mw_contentAcp_rc6 modifies mw_contentAcpBase := {
- resourceName := omit,//M
- resourceType := omit,//M
- resourceID := omit,//M
- parentID := omit,//M
- creationTime := omit,//M
- lastModifiedTime := omit,//M
- labels := omit,//O
- expirationTime := omit,//M
- announceTo := omit,//O
- announcedAttribute := omit,//M
- privileges := omit,//M
- selfPrivileges := omit,//M
- choice := {childResource_list := ?}//O
+ template PrimitiveContent mw_contentAcp_rc6 := {
+ resourceRefList := ?
}
template AccessControlPolicy_optional mw_contentAcp_rc7 modifies mw_contentAcpBase := {
@@ -6327,31 +6315,8 @@ module OneM2M_Templates {
choice := {childResource_list := ?} //O
}
- template Group_optional mw_contentGroup_rc6 modifies mw_contentGroupBase := {
- resourceName := omit,//M
- resourceType := omit,//M
- resourceID := omit,//M
- parentID := omit,//M
- creationTime := omit,//M
- lastModifiedTime := omit,//M
- labels := omit,//O
- accessControlPolicyIDs := omit,//O
- expirationTime := omit,//M
- dynamicAuthorizationConsultationIDs := omit,//O
- announceTo := omit,//O
- announcedAttribute := omit,//M
- creator := omit,//O
- memberType := omit,//M
- currentNrOfMembers := omit,//M
- maxNrOfMembers := omit,//M
- memberIDs := omit,//M
- membersAccessControlPolicyIDs := omit,//O
- memberTypeValidated := omit,//M
- consistencyStrategy := omit,//O
- groupName := omit,//O
- semanticSupportIndicator := omit,//O
- notifyAggregation := omit,//O
- choice := {childResource_list := ?}//O
+ template PrimitiveContent mw_contentGroup_rc6 := {
+ resourceRefList := ?
}
template Group_optional mw_contentGroup_rc7 modifies mw_contentGroupBase := {
@@ -6437,15 +6402,8 @@ module OneM2M_Templates {
template PollingChannel_optional mw_contentPollingChannel_rc5 modifies mw_contentPollingChannelBase := {
}
- template PollingChannel_optional mw_contentPollingChannel_rc6 modifies mw_contentPollingChannelBase := {
- resourceName := *,//M
- resourceType := *,//M
- resourceID := *,//M
- parentID := *,//M
- creationTime := *,//M
- lastModifiedTime := *,//M
- labels := *,//O
- expirationTime := *//M
+ template PrimitiveContent mw_contentPollingChannel_rc6 := {
+ resourceRefList := ?
}
template PollingChannel_optional mw_contentPollingChannel_rc8 modifies mw_contentPollingChannel_allOmit := {
@@ -6646,20 +6604,8 @@ module OneM2M_Templates {
choice := {childResource_list := ?} //O
}
- template Schedule_optional mw_contentSchedule_rc6 modifies mw_contentScheduleBase := {
- resourceName := omit,//M
- resourceType := omit,//M
- resourceID := omit,//M
- parentID := omit,//M
- creationTime := omit,//M
- lastModifiedTime := omit,//M
- labels := omit,//O
- expirationTime := omit,//M
- announceTo := omit,//O
- announcedAttribute := omit,//M
- scheduleElement := omit,//M
- networkCoordinated := omit,//O
- choice := {childResource_list := ?}//O
+ template PrimitiveContent mw_contentSchedule_rc6 := {
+ resourceRefList := ?
}
template Schedule_optional mw_contentSchedule_rc7 modifies mw_contentScheduleBase := {
@@ -6851,34 +6797,8 @@ module OneM2M_Templates {
choice := {childResource_list := ?} //O
}
- template Subscription_optional mw_contentSubscription_rc6 modifies mw_contentSubscriptionBase := {
- resourceName := omit,//M
- resourceType := omit,//M
- resourceID := omit,//M
- parentID := omit,//M
- creationTime := omit,//M
- lastModifiedTime := omit,//M
- labels := omit,//O
- accessControlPolicyIDs := omit,//O
- expirationTime := omit,//M
- dynamicAuthorizationConsultationIDs := omit, //O
- creator := omit,//O
- eventNotificationCriteria := omit,//O
- expirationCounter := omit,//O
- notificationURI := omit,//M
- groupID := omit,//O
- notificationForwardingURI := omit,//O
- batchNotify := omit,//O
- rateLimit := omit,//O
- preSubscriptionNotify := omit,//O
- pendingNotification := omit,//O
- notificationStoragePriority := omit,//O
- latestNotify := omit,//O
- notificationContentType := omit,//M
- notificationEventCat := omit,//O
- subscriberURI := omit,//O
- associatedCrossResourceSub := omit,//O
- choice := {childResource_list := ?}//O
+ template PrimitiveContent mw_contentSubscription_rc6 := {
+ resourceRefList := ?
}
template Subscription_optional mw_contentSubscription_rc7 modifies mw_contentSubscriptionBase := {
@@ -7055,30 +6975,8 @@ module OneM2M_Templates {
choice := {childResource_list := ?} //O
}
- template Container_optional mw_contentContainer_rc6 modifies mw_contentContainerBase := {
- resourceName := omit,//M
- resourceType := omit,//M
- resourceID := omit,//M
- parentID := omit,//M
- creationTime := omit,//M
- lastModifiedTime := omit,//M
- labels := omit,//O
- accessControlPolicyIDs := omit,//O
- expirationTime := omit,//M
- dynamicAuthorizationConsultationIDs := omit, //O
- announceTo := omit,//O
- announcedAttribute := omit,//M
- stateTag := omit,//M
- creator := omit,//M
- maxNrOfInstances := omit,//O
- maxByteSize := omit,//O
- maxInstanceAge := omit,//O
- currentNrOfInstances := omit,//M
- currentByteSize := omit,//M
- locationID := omit,//O
- ontologyRef := omit,//O
- disableRetrieval := omit, //O
- choice := {childResource_list := ?}//O
+ template PrimitiveContent mw_contentContainer_rc6 := {
+ resourceRefList := ?
}
template Container_optional mw_contentContainer_rc7 modifies mw_contentContainerBase := {
@@ -7293,34 +7191,8 @@ module OneM2M_Templates {
choice := {childResource_list := ?} //O
}
- template TimeSeries_optional mw_contentTimeSeries_rc6 modifies mw_contentTimeSeriesBase := {
- resourceName := omit,//M
- resourceType := omit,//M
- resourceID := omit,//M
- parentID := omit,//M
- creationTime := omit,//M
- lastModifiedTime := omit,//M
- labels := omit,//O
- accessControlPolicyIDs := omit,//O
- expirationTime := omit,//M
- dynamicAuthorizationConsultationIDs := omit,//O
- announceTo := omit,//O
- announcedAttribute := omit,//O
- creator := omit,//M
- maxNrOfInstances := omit,//O
- maxByteSize := omit,//O
- maxInstanceAge := omit,//O
- currentNrOfInstances := omit,//M
- currentByteSize := omit,//M
- periodicInterval := omit,//O
- missingDataDetect := omit,//O
- missingDataMaxNr := omit,//O
- missingDataList := omit,//O
- missingDataCurrentNr := omit,//O
- missingDataDetectTimer := omit,//O
- ontologyRef := omit,//O
- contentInfo := omit,//O
- choice := {childResource_list := ?}//O
+ template PrimitiveContent mw_contentTimeSeries_rc6 := {
+ resourceRefList := ?
}
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 c0b53ef5b740f2b857a40833bd78824dc5c4c91f..c832d0c418c6813bfa6e3e7806ed23f20e45f453 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.container := mw_contentContainer_rc6;
+ v_contentResponse:= 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.group_ := mw_contentGroup_rc6;
+ v_contentResponse := 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.accessControlPolicy := mw_contentAcp_rc6;
+ v_contentResponse := 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.subscription := mw_contentSubscription_rc6;
+ v_contentResponse := 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.schedule := mw_contentSchedule_rc6;
+ v_contentResponse := 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.pollingChannel := mw_contentPollingChannelBase;
+ v_contentResponse := 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.timeSeries := mw_contentTimeSeries_rc6;
+ v_contentResponse := 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.container := mw_contentContainer_rc6;
+ v_contentResponse := 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.group_ := mw_contentGroup_rc6;
+ v_contentResponse := 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.accessControlPolicy := mw_contentAcp_rc6;
+ v_contentResponse := 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.schedule := mw_contentSchedule_rc6;
+ v_contentResponse := 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.pollingChannel := mw_contentPollingChannel_rc6;
+ v_contentResponse := 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.subscription := mw_contentSubscription_rc6;
+ v_contentResponse := 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.timeSeries := mw_contentTimeSeries_rc6;
+ v_contentResponse := mw_contentTimeSeries_rc6;
v_ae1.start(f_CSE_DMR_DEL_016(int29, m_createTimeSeriesBase, v_contentResponse, int23, m_createSubscriptionBase));//TimeSeries
v_ae1.done;