diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index f2c41b728de29fdcb8a96bdb13ad81b2e0a7706f..8e97ce8ba9c5a4ed9862e2a9cb3b314adc4e8d04 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Templates.ttcn $
- * $Id: OneM2M_Templates.ttcn 111 2016-09-05 21:03:29Z reinaortega $
+ * $Id: OneM2M_Templates.ttcn 112 2016-09-07 14:29:02Z reinaortega $
* @desc Module containing templates for oneM2M
*
*/
@@ -196,19 +196,14 @@ module OneM2M_Templates {
}//end group Retrieve
group Update {
-
- /**
- * @desc Base UPDATE request primitive for Container resource
- */
- template (value) RequestPrimitive m_updateContainerBase := {
+
+ template (value) RequestPrimitive m_update := {
operation := int3,
to_ := "NotInitialized",
- from_ := PX_AE_ID_STEM,
- requestIdentifier := "m_updateContainer" & f_rnd(1, 1000000),
+ from_ := "NotInitialized",
+ requestIdentifier := "m_update" & f_rnd(1, 1000000),
resourceType := omit,
- primitiveContent:= {
- any_1 := {{Container_optional := m_contentUpdateContainer}}
- },
+ primitiveContent:= omit,
roleIDs := {"1234abcd@role-issuer.com"},//TODO Find a correct value
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
@@ -227,195 +222,82 @@ module OneM2M_Templates {
localTokenIDs := {"Fixme"},//TODO Find a correct value,
tokenReqIndicator := omit
};
+
+ /**
+ * @desc Base UPDATE request primitive for Container resource
+ */
+ template (value) RequestPrimitive m_updateContainerBase modifies m_update:= {
+ from_ := PX_AE_ID_STEM,
+ requestIdentifier := "m_updateContainer" & f_rnd(1, 1000000),
+ primitiveContent:= {
+ any_1 := {{Container_optional := m_contentUpdateContainer}}
+ }
+ };
/**
* @desc Base UPDATE request primitive for AccessControlPolicy resource
*/
- template (value) RequestPrimitive m_updateAcpBase := {
- operation := int3,
- to_ := "NotInitialized",
+ template (value) RequestPrimitive m_updateAcpBase modifies m_update := {
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_updateAcp" & f_rnd(1, 1000000),
- resourceType := omit,
primitiveContent:= {
any_1 := {{AccessControlPolicy_optional := m_contentUpdateAcp}}
- },
- roleIDs := {"1234abcd@role-issuer.com"},//TODO Find a correct value
- originatingTimestamp := omit,
- requestExpirationTimestamp := omit,
- resultExpirationTimestamp := omit,
- operationExecutionTime := omit,
- responseType := omit,
- resultPersistence := omit,
- resultContent := omit,
- eventCategory := omit,
- deliveryAggregation := omit,
- groupRequestIdentifier := omit,
- filterCriteria := omit,
- discoveryResultType := omit,
- tokens := omit,
- tokenIDs := omit,
- localTokenIDs := {"Fixme"},//TODO Find a correct value,
- tokenReqIndicator := omit
-
+ }
};
/**
* @desc Base UPDATE request primitive for Group resource
*/
- template (value) RequestPrimitive m_updateGroupBase := {
- operation := int3,
- to_ := "NotInitialized",
+ template (value) RequestPrimitive m_updateGroupBase modifies m_update := {
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_updateGroup" & f_rnd(1, 1000000),
- resourceType := omit,
primitiveContent:= {
any_1 := {{Group_optional := m_contentUpdateGroup}}
- },
- roleIDs := {"1234abcd@role-issuer.com"},//TODO Find a correct value
- originatingTimestamp := omit,
- requestExpirationTimestamp := omit,
- resultExpirationTimestamp := omit,
- operationExecutionTime := omit,
- responseType := omit,
- resultPersistence := omit,
- resultContent := omit,
- eventCategory := omit,
- deliveryAggregation := omit,
- groupRequestIdentifier := omit,
- filterCriteria := omit,
- discoveryResultType := omit,
- tokens := omit,
- tokenIDs := omit,
- localTokenIDs := {"Fixme"},//TODO Find a correct value,
- tokenReqIndicator := omit
-
+ }
};
/**
* @desc Base UPDATE request primitive for Schedule resource
*/
- template (value) RequestPrimitive m_updateScheduleBase := {
- operation := int3,
- to_ := "NotInitialized",
+ template (value) RequestPrimitive m_updateScheduleBase modifies m_update := {
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_updateSchedule" & f_rnd(1, 1000000),
- resourceType := omit,
primitiveContent:= {
any_1 := {{Schedule_optional := m_contentUpdateSchedule}}
- },
- roleIDs := {"1234abcd@role-issuer.com"},//TODO Find a correct value
- originatingTimestamp := omit,
- requestExpirationTimestamp := omit,
- resultExpirationTimestamp := omit,
- operationExecutionTime := omit,
- responseType := omit,
- resultPersistence := omit,
- resultContent := omit,
- eventCategory := omit,
- deliveryAggregation := omit,
- groupRequestIdentifier := omit,
- filterCriteria := omit,
- discoveryResultType := omit,
- tokens := omit,
- tokenIDs := omit,
- localTokenIDs := {"Fixme"},//TODO Find a correct value,
- tokenReqIndicator := omit
-
+ }
};
/**
* @desc Base UPDATE request primitive for PollingChannel resource
*/
- template (value) RequestPrimitive m_updatePollingChannelBase := {
- operation := int3,
- to_ := "NotInitialized",
+ template (value) RequestPrimitive m_updatePollingChannelBase modifies m_update := {
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_updatePollingChannel" & f_rnd(1, 1000000),
- resourceType := omit,
primitiveContent:= {
any_1 := {{PollingChannel_optional := m_contentUpdatePollingChannel}}
- },
- roleIDs := {"1234abcd@role-issuer.com"},//TODO Find a correct value
- originatingTimestamp := omit,
- requestExpirationTimestamp := omit,
- resultExpirationTimestamp := omit,
- operationExecutionTime := omit,
- responseType := omit,
- resultPersistence := omit,
- resultContent := omit,
- eventCategory := omit,
- deliveryAggregation := omit,
- groupRequestIdentifier := omit,
- filterCriteria := omit,
- discoveryResultType := omit,
- tokens := omit,
- tokenIDs := omit,
- localTokenIDs := {"Fixme"},//TODO Find a correct value,
- tokenReqIndicator := omit
-
+ }
};
/**
* @desc Base UPDATE request primitive for Subscription resource
*/
- template (value) RequestPrimitive m_updateSubscriptionBase := {
- operation := int3,
- to_ := "NotInitialized",
+ template (value) RequestPrimitive m_updateSubscriptionBase modifies m_update := {
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_updateSubscription" & f_rnd(1, 1000000),
- resourceType := omit,
primitiveContent:= {
any_1 := {{Subscription_optional := m_contentUpdateSubscription}}
- },
- roleIDs := {"1234abcd@role-issuer.com"},//TODO Find a correct value
- originatingTimestamp := omit,
- requestExpirationTimestamp := omit,
- resultExpirationTimestamp := omit,
- operationExecutionTime := omit,
- responseType := omit,
- resultPersistence := omit,
- resultContent := omit,
- eventCategory := omit,
- deliveryAggregation := omit,
- groupRequestIdentifier := omit,
- filterCriteria := omit,
- discoveryResultType := omit,
- tokens := omit,
- tokenIDs := omit,
- localTokenIDs := {"Fixme"},//TODO Find a correct value,
- tokenReqIndicator := omit
-
+ }
};
//@Martin
- template (value) RequestPrimitive m_updateLocationPolicy(XSD.ID p_locResourceAddress, in template (omit) AcpType p_accessControlPolicyIDs, in template (omit) XSD.Duration locationUpdatePeriod) := {
- operation := int3, //create
+ template (value) RequestPrimitive m_updateLocationPolicy(XSD.ID p_locResourceAddress, in template (omit) AcpType p_accessControlPolicyIDs, in template (omit) XSD.Duration locationUpdatePeriod) modifies m_update := {
to_ := p_locResourceAddress,
from_ := PX_AE_ID_STEM, //AE originator id e.g.
requestIdentifier := "m_updateLocationPolicy",
- resourceType := omit,//NP
primitiveContent := {
any_1 := {{ LocationPolicy_optional := m_contentUpdateLocationPolicy(p_accessControlPolicyIDs, locationUpdatePeriod) }}
- },
- roleIDs := {"1234abcd@role-issuer.com"},//TODO Find a correct value
- originatingTimestamp := omit,
- requestExpirationTimestamp := omit,
- resultExpirationTimestamp := omit,
- operationExecutionTime := omit,
- responseType := omit,
- resultPersistence := omit,
- resultContent := int1,//default
- eventCategory := omit,
- deliveryAggregation := omit,
- groupRequestIdentifier := omit,
- filterCriteria := omit,
- discoveryResultType := omit,
- tokens := omit,
- tokenIDs := omit,
- localTokenIDs := {"Fixme"},//TODO Find a correct value,
- tokenReqIndicator := omit
- };
+ }
+ };
}//end group Update
@@ -537,7 +419,7 @@ module OneM2M_Templates {
template (value) RequestPrimitive m_createCSEBase (in ServiceSubscribedAppRule p_serviceSubscribedAppRule) modifies m_create := {
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_createCSE" & f_rnd(1, 1000000),
- resourceType := int1,
+ resourceType := int1,//FIXME Is this the value for CSEBase? In any case, this template is not used at all
primitiveContent := {
any_1 := {{CSEBase_optional := m_contentCreateCSEBase (p_serviceSubscribedAppRule)}}
}
@@ -616,7 +498,7 @@ module OneM2M_Templates {
requestIdentifier := "m_createPollingChannel" & f_rnd(1, 1000000),
resourceType := int15,
primitiveContent := {
- any_1 := {{PollingChannel_optional := m_contentCreatePollingChannel (p_accessControlPolicyIDs)}}
+ any_1 := {{PollingChannel_optional := m_contentCreatePollingChannel ()}}
}
};
@@ -645,7 +527,7 @@ module OneM2M_Templates {
template (value) RequestPrimitive m_createServiceSubscribedAppRule (in ListOfM2MID p_applicableCredIDs, in ListOfM2MID p_allowedApp_IDs, in ListOfM2MID p_allowedAEs) modifies m_create := {
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_createCSE" & f_rnd(1, 1000000),
- resourceType := int1,
+ resourceType := int1,//FIXME Is this the correct value?
primitiveContent := {
any_1 := {{ServiceSubscribedAppRule_optional := m_contentCreateServiceSubscribedAppRule (p_applicableCredIDs, p_allowedApp_IDs, p_allowedAEs)}}
}
@@ -759,6 +641,7 @@ module OneM2M_Templates {
labels := omit,//O
accessControlPolicyIDs := p_accessControlPolicyIDs,//O
expirationTime := omit,//O
+ dynamicAuthorizationConsultationIDs := omit, //TODO Check whether it is optional or mandatory for create operation
link := omit,//O
appName := omit,//O
app_ID := p_appId,//M
@@ -768,6 +651,7 @@ module OneM2M_Templates {
nodeLink := omit,//NP
requestReachability := true,//M
contentSerialization := omit,//O
+ e2eSecInfo := omit, //TODO Check whether it is optional or mandatory for create operation
choice := omit//NP
};
@@ -787,6 +671,7 @@ module OneM2M_Templates {
labels := omit,//O
accessControlPolicyIDs := p_accessControlPolicyIDs,//O
expirationTime := omit,//O
+ dynamicAuthorizationConsultationIDs := omit, //TODO Check whether it is optional or mandatory for create operation
announceTo := omit,//O
announcedAttribute := omit,//O
appName := omit,//O
@@ -797,6 +682,7 @@ module OneM2M_Templates {
nodeLink := omit,//NP
requestReachability := true,//M
contentSerialization := omit,//O
+ e2eSecInfo := omit, //TODO Check whether it is optional or mandatory for create operation
choice := omit//NP
};
@@ -855,7 +741,7 @@ module OneM2M_Templates {
supportedResourceType := omit,
pointOfAccess := omit,
nodeLink := omit,
-
+ e2eSecInfo := omit, //TODO Check whether it is optional or mandatory for create operation
choice := {
choice_list := {{
serviceSubscribedAppRule := p_serviceSubscribedAppRule
@@ -883,6 +769,7 @@ module OneM2M_Templates {
labels := omit,//O
accessControlPolicyIDs := p_accessControlPolicyIDs,//O
expirationTime := omit,//O
+ dynamicAuthorizationConsultationIDs := omit, //TODO Check whether it is optional or mandatory for create operation
announceTo := omit,//O
announcedAttribute := omit,//O
creator := omit,//O
@@ -894,7 +781,6 @@ module OneM2M_Templates {
memberTypeValidated := omit,//NP
consistencyStrategy := omit,//O
groupName := omit,//O
- fanOutPoint := omit,//NP
choice := omit//NP
};
@@ -903,8 +789,7 @@ module OneM2M_Templates {
* @param p_accessControlPolicyIDs ACP IDs for the PollingChannel
* @param p_name Resource name
*/
- template (value) PollingChannel_optional m_contentCreatePollingChannel (in template (omit) AcpType p_accessControlPolicyIDs,
- in template (omit) XSD.String p_name := c_defaultResourceName) := {
+ template (value) PollingChannel_optional m_contentCreatePollingChannel (in template (omit) XSD.String p_name := c_defaultResourceName) := {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
@@ -912,9 +797,7 @@ module OneM2M_Templates {
creationTime := omit,//NP
lastModifiedTime := omit,//NP
labels := omit,//O
- accessControlPolicyIDs := p_accessControlPolicyIDs,//O
- expirationTime := omit,//O
- pollingChannelURI := omit//NP
+ expirationTime := omit//O
};
/**
@@ -948,6 +831,7 @@ module OneM2M_Templates {
labels := omit,
accessControlPolicyIDs := omit,
expirationTime := omit,
+ dynamicAuthorizationConsultationIDs := omit, //TODO Check whether it is optional or mandatory for create operation
applicableCredIDs := p_applicableCredIDs,
allowedApp_IDs := p_allowedApp_IDs,
allowedAEs := p_allowedAEs,
@@ -971,6 +855,7 @@ module OneM2M_Templates {
labels := omit,//O
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
+ dynamicAuthorizationConsultationIDs := omit, //TODO Check whether it is optional or mandatory for create operation
eventNotificationCriteria := omit,//O
expirationCounter := omit,//O
notificationURI := p_notificationURI,//M
@@ -1008,12 +893,14 @@ module OneM2M_Templates {
creator := omit,//O
contentInfo := "a",//O
contentSize := omit,//NP
+ contentRef := omit, //TODO Check whether it is optional or mandatory for create operation
ontologyRef := omit,//O
content := {
embed_values := {p_primitiveContent},
attr := omit,
elem_list := {}
- }//M
+ }, //M
+ choice := omit // TODO Check whether it is optional or mandatory for create operation
};
/**
@@ -1030,6 +917,7 @@ module OneM2M_Templates {
labels := omit,//O
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
+ dynamicAuthorizationConsultationIDs := omit, //TODO Check whether it is optional or mandatory for create operation
announceTo := omit,//O
announcedAttribute := omit,//O
stateTag := omit,//NP
@@ -1041,8 +929,7 @@ module OneM2M_Templates {
currentByteSize := omit,//NP
locationID := omit,//O
ontologyRef := omit,//O
- latest := omit,//NP
- oldest := omit,//NP
+ disableRetrieval := omit, //TODO Check whether it is optional or mandatory for create operation
choice := omit//NP
};
@@ -1056,6 +943,7 @@ module OneM2M_Templates {
lastModifiedTime := omit, //NP
labels := LABELS,//O
accessControlPolicyIDs := p_accessControlPolicyIDs, //O
+ dynamicAuthorizationConsultationIDs := omit, //TODO Check whether it is optional or mandatory for create operation
expirationTime := omit, //O
announceTo := omit, //O
announcedAttribute := omit, //O
@@ -1087,6 +975,7 @@ module OneM2M_Templates {
labels := omit,//O
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
+ dynamicAuthorizationConsultationIDs := omit, //TODO Check whether it is optional or mandatory for create operation
announceTo := omit,//O
announcedAttribute := omit,//O
appName := omit,//O
@@ -1097,6 +986,7 @@ module OneM2M_Templates {
nodeLink := omit,//NP
requestReachability := omit,//O
contentSerialization := omit,//O
+ e2eSecInfo := omit, //TODO Check whether it is optional or mandatory for create operation
choice := omit//NP
};
@@ -1132,6 +1022,7 @@ module OneM2M_Templates {
labels := omit,//O
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
+ dynamicAuthorizationConsultationIDs := omit, //TODO Check whether it is optional or mandatory for create operation
announceTo := omit,//O
announcedAttribute := omit,//O
creator := omit,//NP
@@ -1143,7 +1034,6 @@ module OneM2M_Templates {
memberTypeValidated := omit,//NP
consistencyStrategy := omit,//NP
groupName := omit,//O
- fanOutPoint := omit,//NP
choice := omit//NP
};
@@ -1159,9 +1049,7 @@ module OneM2M_Templates {
creationTime := omit,//NP
lastModifiedTime := omit,//NP
labels := omit,//O
- accessControlPolicyIDs := omit,//O
- expirationTime := omit,//O
- pollingChannelURI := omit//NP
+ expirationTime := omit//O
};
/**
@@ -1195,6 +1083,7 @@ module OneM2M_Templates {
labels := omit,//O
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
+ dynamicAuthorizationConsultationIDs := omit, //TODO Check whether it is optional or mandatory for create operation
eventNotificationCriteria := omit,//O
expirationCounter := omit,//O
notificationURI := omit,//O
@@ -1231,12 +1120,14 @@ module OneM2M_Templates {
creator := omit,//O
contentInfo := omit,//O
contentSize := omit,//NP
+ contentRef := omit, //TODO Check whether it is optional or mandatory for create operation
ontologyRef := omit,//O
content := {
embed_values := {p_primitiveContent},
attr := omit,
elem_list := {}
- }//O
+ }, //O
+ choice := omit //TODO Check whether it is optional or mandatory for create operation
};
/**
@@ -1252,6 +1143,7 @@ module OneM2M_Templates {
labels := omit,//O
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
+ dynamicAuthorizationConsultationIDs := omit, //TODO Check whether it is optional or mandatory for create operation
announceTo := omit,//O
announcedAttribute := omit,//O
stateTag := omit,//NP
@@ -1263,8 +1155,7 @@ module OneM2M_Templates {
currentByteSize := omit,//NP
locationID := omit,//O
ontologyRef := omit,//O
- latest := omit,//NP
- oldest := omit,//NP
+ disableRetrieval := omit, //TODO Check whether it is optional or mandatory for create operation
choice := omit//NP
};
@@ -1278,6 +1169,7 @@ module OneM2M_Templates {
lastModifiedTime := omit,//NP
labels := LABELS,//O
accessControlPolicyIDs := p_accessControlPolicyIDs,//O
+ dynamicAuthorizationConsultationIDs := omit, //TODO Check whether it is optional or mandatory for create operation
expirationTime := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
@@ -1305,6 +1197,7 @@ module OneM2M_Templates {
labels := *,//O
accessControlPolicyIDs := *,//O
expirationTime := ?,//M
+ dynamicAuthorizationConsultationIDs := omit, //TODO Check whether it is optional or mandatory for create operation
announceTo := *,//O
announcedAttribute := ?,//M
appName := *,//O
@@ -1315,6 +1208,7 @@ module OneM2M_Templates {
nodeLink := *,//O
requestReachability := ?,//M
contentSerialization := *,//O
+ e2eSecInfo:= *, //TODO Check whether it is optional or mandatory for create operation
choice := *//O
};
@@ -1399,6 +1293,7 @@ module OneM2M_Templates {
labels := *,//O
accessControlPolicyIDs := *,//O
expirationTime := ?,//M
+ dynamicAuthorizationConsultationIDs := *, //TODO Check whether it is optional or mandatory for create operation
announceTo := *,//O
announcedAttribute := *,//O
creator := *,//O
@@ -1410,7 +1305,6 @@ module OneM2M_Templates {
memberTypeValidated := *,//O
consistencyStrategy := *,//O
groupName := *,//O
- fanOutPoint := omit,//M
choice := *//O
};
@@ -1435,7 +1329,6 @@ module OneM2M_Templates {
memberTypeValidated := omit,//M
consistencyStrategy := omit,//O
groupName := omit,//O
- fanOutPoint := omit,//M
choice := omit//O
}
@@ -1450,7 +1343,7 @@ module OneM2M_Templates {
}
template Group_optional mw_contentGroup_rc4 modifies mw_contentGroupBase := {
- choice := {subscription_list := ?} //O
+ choice := {choice_list := {{subscription := ?}}} //O
}
template Group_optional mw_contentGroup_rc5 modifies mw_contentGroupBase := {
@@ -1478,7 +1371,6 @@ module OneM2M_Templates {
memberTypeValidated := omit,//M
consistencyStrategy := omit,//O
groupName := omit,//O
- fanOutPoint := omit,//M
choice := {childResource_list := ?}//O
}
@@ -1494,9 +1386,7 @@ module OneM2M_Templates {
creationTime := ?,//M
lastModifiedTime := ?,//M
labels := *,//O
- accessControlPolicyIDs := *,//O
- expirationTime := ?,//M
- pollingChannelURI := ?//M
+ expirationTime := ?//M
};
template PollingChannel_optional mw_contentPollingChannel_allOmit := {
@@ -1507,9 +1397,7 @@ module OneM2M_Templates {
creationTime := omit,//M
lastModifiedTime := omit,//M
labels := omit,//O
- accessControlPolicyIDs := omit,//O
- expirationTime := omit,//M
- pollingChannelURI := omit//M
+ expirationTime := omit//M
};
template Schedule_optional mw_contentScheduleBase := {
@@ -1589,6 +1477,7 @@ module OneM2M_Templates {
labels := *,//O
accessControlPolicyIDs := *,//O
expirationTime := ?,//M
+ dynamicAuthorizationConsultationIDs := *, //TODO Check whether it is optional or mandatory for create operation
eventNotificationCriteria := *,//O
expirationCounter := *,//O
notificationURI := ?,//M
@@ -1616,6 +1505,7 @@ module OneM2M_Templates {
labels := omit,//O
accessControlPolicyIDs := omit,//O
expirationTime := omit,//M
+ dynamicAuthorizationConsultationIDs := omit, //TODO Check whether it is optional or mandatory for create operation
eventNotificationCriteria := omit,//O
expirationCounter := omit,//O
notificationURI := omit,//M
@@ -1645,11 +1535,11 @@ module OneM2M_Templates {
}
template Subscription_optional mw_contentSubscription_rc4 modifies mw_contentSubscriptionBase := {
- choice := {schedule := ?} //O
+ choice := { choice_list := {{schedule := ?}}} //O
}
template Subscription_optional mw_contentSubscription_rc5 modifies mw_contentSubscriptionBase := {
- choice := {childResource := ?} //O
+ choice := {childResource_list := ?} //O
}
template Subscription_optional mw_contentSubscription_rc6 modifies mw_contentSubscriptionBase := {
@@ -1677,7 +1567,7 @@ module OneM2M_Templates {
notificationEventCat := omit,//O
creator := omit,//O
subscriberURI := omit,//O
- choice := {childResource := ?}//O
+ choice := {childResource_list := ?}//O
}
template Subscription_optional mw_contentSubscription_rc7 modifies mw_contentSubscriptionBase := {
@@ -1699,8 +1589,11 @@ module OneM2M_Templates {
creator := *,//O
contentInfo := *,//O
contentSize := ?,//M
+ contentRef := *, //TODO Check whether it is optional or mandatory for create operation
ontologyRef := *,//O
- content := ?//M
+ content := ?,//M
+ choice := * //TODO Check whether it is optional or mandatory for create operation
+
};
template Container_optional mw_contentContainerBase := {
@@ -1713,6 +1606,7 @@ module OneM2M_Templates {
labels := *,//O
accessControlPolicyIDs := *,//O
expirationTime := ?,//M
+ dynamicAuthorizationConsultationIDs := *, //TODO Check whether it is optional or mandatory for create operation
announceTo := *,//O
announcedAttribute := *,//O
stateTag := ?,//M
@@ -1724,8 +1618,7 @@ module OneM2M_Templates {
currentByteSize := ?,//M
locationID := *,//O
ontologyRef := *,//O
- latest := omit,//M
- oldest := omit,//M
+ disableRetrieval := *, //TODO Check whether it is optional or mandatory for create operation
choice := *//O
};
@@ -1750,8 +1643,6 @@ module OneM2M_Templates {
currentByteSize := omit,//M
locationID := omit,//O
ontologyRef := omit,//O
- latest := omit,//M
- oldest := omit,//M
choice := omit//O
}
@@ -1794,8 +1685,7 @@ module OneM2M_Templates {
currentByteSize := omit,//M
locationID := omit,//O
ontologyRef := omit,//O
- latest := omit,//M
- oldest := omit,//M
+ disableRetrieval := omit, //TODO Check whether it is optional or mandatory for create operation
choice := {childResource_list := ?}//O
}
diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index c780e4ec659c99b94355a14a393688ac5bfa8637..212234cb2a0a2c5e33981503d9949abbbb214391 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Types.ttcn $
- * $Id: OneM2M_Types.ttcn 106 2016-09-01 06:59:26Z reinaortega $
+ * $Id: OneM2M_Types.ttcn 112 2016-09-07 14:29:02Z reinaortega $
* @desc Test System module for oneM2M
*
*/
@@ -6381,6 +6381,7 @@ group optionalResourceTypes {
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
XSD.AnyURI link optional,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.String appName optional,
XSD.String app_ID optional,
XSD.ID aE_ID optional,
@@ -6389,6 +6390,7 @@ group optionalResourceTypes {
XSD.AnyURI nodeLink optional,
XSD.Boolean requestReachability optional,
Serializations contentSerialization optional,
+ E2eSecInfo e2eSecInfo optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
@@ -6399,10 +6401,16 @@ group optionalResourceTypes {
AccessControlPolicy accessControlPolicy,
AccessControlPolicyAnnc accessControlPolicyAnnc,
Subscription subscription,
- ScheduleAnnc scheduleAnnc
+ ScheduleAnnc scheduleAnnc,
+ SemanticDescriptor semanticDescriptor,
+ TimeSeries timeSeries,
+ TimeSeriesAnnc timeSeriesAnnc,
+ TrafficPatternAnnc trafficPatternAnnc,
+ Sg_flexContainerResource_group sg_flexContainerResource,
+ Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource
} choice_list
} choice optional
- }
+ }
with {
variant "element";
variant (resourceName) "attribute";
@@ -6429,6 +6437,7 @@ group optionalResourceTypes {
Labels labels optional,
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
XSD.String appName optional,
@@ -6439,6 +6448,7 @@ group optionalResourceTypes {
XSD.AnyURI nodeLink optional,
XSD.Boolean requestReachability optional,
Serializations contentSerialization optional,
+ E2eSecInfo e2eSecInfo optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
@@ -6447,7 +6457,11 @@ group optionalResourceTypes {
AccessControlPolicy accessControlPolicy,
Subscription subscription,
PollingChannel pollingChannel,
- Schedule schedule
+ Schedule schedule,
+ SemanticDescriptor semanticDescriptor,
+ TimeSeries timeSeries,
+ TrafficPattern trafficPattern,
+ Sg_flexContainerResource_group sg_flexContainerResource
} choice_list
} choice optional
}
@@ -6514,8 +6528,13 @@ group optionalResourceTypes {
XSD.ID creator optional,
ContentInfo contentInfo optional,
XSD.NonNegativeInteger contentSize optional,
+ ContentRef contentRef optional,
XSD.AnyURI ontologyRef optional,
- XSD.AnyType content optional
+ XSD.AnyType content optional,
+ union {
+ record length(1 .. infinity) of ChildResourceRef childResource_list,
+ record length(1 .. infinity) of SemanticDescriptor semanticDescriptor_list
+ } choice optional
}
with {
variant "name as uncapitalized";
@@ -6535,6 +6554,7 @@ group optionalResourceTypes {
Labels labels optional,
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
XSD.NonNegativeInteger stateTag optional,
@@ -6546,14 +6566,15 @@ group optionalResourceTypes {
XSD.NonNegativeInteger currentByteSize optional,
XSD.AnyURI locationID optional,
XSD.AnyURI ontologyRef optional,
- XSD.AnyURI latest optional,
- XSD.AnyURI oldest optional,
+ XSD.Boolean disableRetrieval optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
ContentInstance contentInstance,
Container container,
- Subscription subscription
+ Subscription subscription,
+ SemanticDescriptor semanticDescriptor,
+ Sg_flexContainerResource_group sg_flexContainerResource
} choice_list
} choice optional
}
@@ -6586,10 +6607,12 @@ group optionalResourceTypes {
record of ResourceType supportedResourceType optional,
PoaList pointOfAccess optional,
XSD.AnyURI nodeLink optional,
+ E2eSecInfo e2eSecInfo optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
RemoteCSE remoteCSE,
+ RemoteCSEAnnc remoteCSEAnnc,
Node node,
AE aE,
Container container,
@@ -6604,7 +6627,10 @@ group optionalResourceTypes {
Delivery delivery,
Schedule schedule,
M2mServiceSubscriptionProfile m2mServiceSubscriptionProfile,
- ServiceSubscribedAppRule serviceSubscribedAppRule
+ ServiceSubscribedAppRule serviceSubscribedAppRule,
+ Role role,
+ XSD.Token token,
+ Sg_flexContainerResource_group sg_flexContainerResource
} choice_list
} choice optional
}
@@ -6634,6 +6660,7 @@ group optionalResourceTypes {
Labels labels optional,
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
XSD.ID creator optional,
@@ -6645,10 +6672,12 @@ group optionalResourceTypes {
XSD.Boolean memberTypeValidated optional,
ConsistencyStrategy consistencyStrategy optional,
XSD.String groupName optional,
- XSD.AnyURI fanOutPoint optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
- record length(1 .. infinity) of Subscription subscription_list
+ record length(1 .. infinity) of union {
+ Subscription subscription,
+ SemanticDescriptor semanticDescriptor
+ } choice_list
} choice optional
}
with {
@@ -6674,9 +6703,7 @@ group optionalResourceTypes {
Timestamp creationTime optional,
Timestamp lastModifiedTime optional,
Labels labels optional,
- AcpType accessControlPolicyIDs optional,
- Timestamp expirationTime optional,
- XSD.AnyURI pollingChannelURI optional
+ Timestamp expirationTime optional
}
with {
variant "name as uncapitalized";
@@ -6728,6 +6755,7 @@ group optionalResourceTypes {
Labels labels optional,
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfM2MID applicableCredIDs optional,
ListOfM2MID allowedApp_IDs optional,
ListOfM2MID allowedAEs optional,
@@ -6759,6 +6787,8 @@ group optionalResourceTypes {
Labels labels optional,
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID creator optional,
EventNotificationCriteria eventNotificationCriteria optional,
XSD.PositiveInteger expirationCounter optional,
ListOfURIs notificationURI optional,
@@ -6772,11 +6802,13 @@ group optionalResourceTypes {
XSD.Boolean latestNotify optional,
NotificationContentType notificationContentType optional,
EventCat notificationEventCat optional,
- XSD.ID creator optional,
XSD.AnyURI subscriberURI optional,
union {
- ChildResourceRef childResource,
- Schedule schedule
+ record length(1 .. infinity) of ChildResourceRef childResource_list,
+ record length(1 .. infinity) of union {
+ Schedule schedule,
+ NotificationTargetMgmtPolicyRef notificationTargetMgmtPolicyRef
+ } choice_list
} choice optional
}
with {
@@ -6800,6 +6832,7 @@ group optionalResourceTypes {
Labels labels optional,
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime optional,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
LocationSource locationSource optional,
@@ -6815,8 +6848,7 @@ group optionalResourceTypes {
Subscription subscription
} choice_list
} choice optional
-
-}
+ }
with {
variant "name as uncapitalized";
variant "element";
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index 4e877fd8c6ca49a9f570c77bf48f4ce766b72f05..477eb172914a5c549865945f844af9ca5b3f66c7 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Testcases.ttcn $
- * $Id: OneM2M_Testcases.ttcn 106 2016-09-01 06:59:26Z reinaortega $
+ * $Id: OneM2M_Testcases.ttcn 112 2016-09-07 14:29:02Z reinaortega $
* @desc Module containing test cases for oneM2M
*
*/
@@ -3212,7 +3212,7 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.any_1[0].PollingChannel_optional.labels := v_labels_1;//Attribute 3
//No Attribute 1
- v_updateRequest.primitiveContent.any_1[0].PollingChannel_optional.accessControlPolicyIDs := v_acp;//Attribute 2
+ //v_updateRequest.primitiveContent.any_1[0].PollingChannel_optional.accessControlPolicyIDs := v_acp;//Attribute 2 TODO Find another alternative for Attribute 2
v_updateRequest.primitiveContent.any_1[0].PollingChannel_optional.labels := v_labels_2;//Attribute 3
v_nullFields := {"labels"};
@@ -3224,10 +3224,10 @@ module OneM2M_Testcases {
if(ischosen(v_responsePrimitive.primitiveContent.any_1[0].PollingChannel_optional)) {
//Check attribute 1
- //Check attribute 2
- if(not match(v_responsePrimitive.primitiveContent.any_1[0].PollingChannel_optional.accessControlPolicyIDs, valueof(v_updateRequest.primitiveContent.any_1[0].PollingChannel_optional.accessControlPolicyIDs))){
+ //Check attribute 2 TODO once another alternative is found, activate this checking
+ /*if(not match(v_responsePrimitive.primitiveContent.any_1[0].PollingChannel_optional.accessControlPolicyIDs, valueof(v_updateRequest.primitiveContent.any_1[0].PollingChannel_optional.accessControlPolicyIDs))){
setverdict(fail, testcasename() & ": Error: ACPI attribute not added correctly")
- }
+ }*/
//Check attribute 3
if(ispresent(v_responsePrimitive.primitiveContent.any_1[0].PollingChannel_optional.labels)){
setverdict(fail, testcasename() & ": Error: Labels attribute not deleted correctly")
@@ -4250,8 +4250,7 @@ module OneM2M_Testcases {
testcase TC_CSE_GMG_BV_005() runs on CseTester system CseSystem
{
- // TODO: use right values for c_fanoutPointAddress and c_RessourceType1
- var XSD.AnyURI c_fanoutPointAddress := "FANOUTPOINT_ADDRESS";
+ // TODO: use right values for c_RessourceType1
var ResourceType c_RessourceType1 := int1;
// Local variables
@@ -4263,8 +4262,6 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := m_createGroupBase;
-
- v_createRequest.primitiveContent.any_1[0].Group_optional.fanOutPoint := c_fanoutPointAddress;
v_createRequest.primitiveContent.any_1[0].Group_optional.resourceType := c_RessourceType1;
@@ -4320,8 +4317,7 @@ module OneM2M_Testcases {
- // TODO: use right values for c_fanoutPointAddress and c_RessourceType1
- var XSD.AnyURI c_fanoutPointAddress := "FANOUTPOINT_ADDRESS";
+ // TODO: use right values for c_RessourceType1
var ResourceType c_RessourceType1 := int1;
// Local variables
@@ -4333,7 +4329,6 @@ module OneM2M_Testcases {
v_request := valueof(m_retrieveResource(f_getResourceAddress(-2) & "/" & v_resourceId));
- v_request.primitiveContent.any_1[0].Group_optional.fanOutPoint := c_fanoutPointAddress;
// Test control
@@ -4385,8 +4380,7 @@ module OneM2M_Testcases {
testcase TC_CSE_GMG_BV_007() runs on CseTester system CseSystem
{
- // TODO: use right values for c_fanoutPointAddress and c_RessourceType1
- var XSD.AnyURI c_fanoutPointAddress := "FANOUTPOINT_ADDRESS";
+ // TODO: use right values for c_RessourceType1
// Local variables
var MsgIn v_response;
@@ -4397,9 +4391,6 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := m_createGroupBase;
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
- v_updateRequest.primitiveContent.any_1[0].Group_optional.fanOutPoint := c_fanoutPointAddress;
-
-
// Test control
// Test component configuration
@@ -4451,8 +4442,7 @@ module OneM2M_Testcases {
testcase TC_CSE_GMG_BV_008_1() runs on CseTester system CseSystem
{
- // TODO: use right values for c_fanoutPointAddress and c_deleteAddress
- var XSD.AnyURI c_fanoutPointAddress := "FANOUTPOINT_ADDRESS";
+ // TODO: use right values for c_deleteAddress
var XSD.ID c_deleteAddress := "DELETE";
//Local variables
@@ -4466,9 +4456,6 @@ module OneM2M_Testcases {
var template RequestPrimitive v_deleteRequest := m_deleteRequest(c_deleteAddress);
- v_deleteRequest.primitiveContent.any_1[0].Group_optional.fanOutPoint := c_fanoutPointAddress;
-
-
// Test control
// Test component configuration