Commit 49a2b3b1 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Reordering of fields for some templates


Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parent 7025783d
......@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Templates.ttcn $
* $Id: OneM2M_Templates.ttcn 112 2016-09-07 14:29:02Z reinaortega $
* $Id: OneM2M_Templates.ttcn 114 2016-09-09 07:12:19Z reinaortega $
* @desc Module containing templates for oneM2M
*
*/
......@@ -856,6 +856,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //TODO Check whether it is optional or mandatory for create operation
creator := omit,//O
eventNotificationCriteria := omit,//O
expirationCounter := omit,//O
notificationURI := p_notificationURI,//M
......@@ -869,7 +870,6 @@ module OneM2M_Templates {
latestNotify := omit,//O
notificationContentType := int1, //TODO Set to omit once xsd is fixed,//O
notificationEventCat := omit,//O
creator := omit,//O
subscriberURI := omit,//O
choice := omit//NP
};
......@@ -943,8 +943,8 @@ 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
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //TODO Check whether it is optional or mandatory for create operation
announceTo := omit, //O
announcedAttribute := omit, //O
locationSource := PX_LOCATION_SOURCE, //M
......@@ -1084,6 +1084,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //TODO Check whether it is optional or mandatory for create operation
creator := omit,//NP
eventNotificationCriteria := omit,//O
expirationCounter := omit,//O
notificationURI := omit,//O
......@@ -1097,7 +1098,6 @@ module OneM2M_Templates {
latestNotify := omit,//O
notificationContentType := omit,//O
notificationEventCat := omit,//O
creator := omit,//NP
subscriberURI := omit,//NP
choice := omit//NP
};
......@@ -1169,8 +1169,8 @@ 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
dynamicAuthorizationConsultationIDs := omit, //TODO Check whether it is optional or mandatory for create operation
announceTo := omit,//O
announcedAttribute := omit,//O
locationSource := omit,//NP
......@@ -1478,6 +1478,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := *,//O
expirationTime := ?,//M
dynamicAuthorizationConsultationIDs := *, //TODO Check whether it is optional or mandatory for create operation
creator := *,//O
eventNotificationCriteria := *,//O
expirationCounter := *,//O
notificationURI := ?,//M
......@@ -1491,7 +1492,6 @@ module OneM2M_Templates {
latestNotify := *,//O
notificationContentType := *,//O
notificationEventCat := *,//O
creator := *,//O
subscriberURI := *,//O
choice := *//O
};
......@@ -1506,6 +1506,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,//O
expirationTime := omit,//M
dynamicAuthorizationConsultationIDs := omit, //TODO Check whether it is optional or mandatory for create operation
creator := omit,//O
eventNotificationCriteria := omit,//O
expirationCounter := omit,//O
notificationURI := omit,//M
......@@ -1519,7 +1520,6 @@ module OneM2M_Templates {
latestNotify := omit,//O
notificationContentType := omit,//M
notificationEventCat := omit,//O
creator := omit,//O
subscriberURI := omit,//O
choice := omit//O
}
......@@ -1552,6 +1552,8 @@ 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
creator := omit,//O
eventNotificationCriteria := omit,//O
expirationCounter := omit,//O
notificationURI := omit,//M
......@@ -1565,7 +1567,6 @@ module OneM2M_Templates {
latestNotify := omit,//O
notificationContentType := omit,//M
notificationEventCat := omit,//O
creator := omit,//O
subscriberURI := omit,//O
choice := {childResource_list := ?}//O
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment