Skip to content
Snippets Groups Projects
Commit b82e31c7 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Checking of new fields in templates mandatory or optional done

parent 015b1050
No related branches found
No related tags found
1 merge request!25Ae fixes
Hide whitespace changes
Inline Side-by-side
LibOneM2M/OneM2M_Templates.ttcn
+ 64
− 95
View file @ b82e31c7
......@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Templates.ttcn $
* $Id: OneM2M_Templates.ttcn 114 2016-09-09 07:12:19Z reinaortega $
* $Id: OneM2M_Templates.ttcn 117 2016-09-14 07:11:15Z reinaortega $
* @desc Module containing templates for oneM2M
*
*/
......@@ -79,7 +79,7 @@ module OneM2M_Templates {
requestIdentifier := "m_retrieveCseBase" & f_rnd(1, 1000000),
resourceType := omit,
primitiveContent := omit,
roleIDs := {"1234abcd@role-issuer.com"},//TODO Find a correct value
roleIDs := {"1234abcd@role-issuer.com"}, // TODO Find a correct value
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
......@@ -671,7 +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
dynamicAuthorizationConsultationIDs := omit, //O
announceTo := omit,//O
announcedAttribute := omit,//O
appName := omit,//O
......@@ -682,7 +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
e2eSecInfo := omit, //O
choice := omit//NP
};
......@@ -741,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
e2eSecInfo := omit,
choice := {
choice_list := {{
serviceSubscribedAppRule := p_serviceSubscribedAppRule
......@@ -769,11 +769,11 @@ 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
dynamicAuthorizationConsultationIDs := omit, //O
announceTo := omit,//O
announcedAttribute := omit,//O
creator := omit,//O
memberType := int2,//TODO: To be set to omit //O
memberType := omit,//O
currentNrOfMembers := omit,//NP
maxNrOfMembers := p_maxNrOfMembers,//M
memberIDs := p_memberIds,//M
......@@ -822,20 +822,20 @@ module OneM2M_Templates {
};
template (value) ServiceSubscribedAppRule_optional m_contentCreateServiceSubscribedAppRule (in ListOfM2MID p_applicableCredIDs, in ListOfM2MID p_allowedApp_IDs, in ListOfM2MID p_allowedAEs) := {
resourceName := omit,
resourceType := omit,
resourceID := omit,
parentID := omit,
creationTime := omit,
lastModifiedTime := omit,
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,
choice := omit
resourceName := omit,//TODO TS-0004 7.4.29.1 2 Missing attribute
resourceType := omit,//NP
resourceID := omit,//NP
parentID := omit,//NP
creationTime := omit,//NP
lastModifiedTime := omit,//NP
labels := omit,//O
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
applicableCredIDs := p_applicableCredIDs,//O
allowedApp_IDs := p_allowedApp_IDs,//O
allowedAEs := p_allowedAEs,//O
choice := omit //O
}
......@@ -855,7 +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
dynamicAuthorizationConsultationIDs := omit, //O
creator := omit,//O
eventNotificationCriteria := omit,//O
expirationCounter := omit,//O
......@@ -868,7 +868,7 @@ module OneM2M_Templates {
pendingNotification := omit,//O
notificationStoragePriority := omit,//O
latestNotify := omit,//O
notificationContentType := int1, //TODO Set to omit once xsd is fixed,//O
notificationContentType := omit, //O
notificationEventCat := omit,//O
subscriberURI := omit,//O
choice := omit//NP
......@@ -893,14 +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
contentRef := omit, //O
ontologyRef := omit,//O
content := {
embed_values := {p_primitiveContent},
attr := omit,
elem_list := {}
}, //M
choice := omit // TODO Check whether it is optional or mandatory for create operation
choice := omit //O
};
/**
......@@ -917,7 +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
dynamicAuthorizationConsultationIDs := omit, //O
announceTo := omit,//O
announcedAttribute := omit,//O
stateTag := omit,//NP
......@@ -929,7 +929,7 @@ module OneM2M_Templates {
currentByteSize := omit,//NP
locationID := omit,//O
ontologyRef := omit,//O
disableRetrieval := omit, //TODO Check whether it is optional or mandatory for create operation
disableRetrieval := omit, //O
choice := omit//NP
};
......@@ -944,7 +944,7 @@ module OneM2M_Templates {
labels := LABELS,//O
accessControlPolicyIDs := p_accessControlPolicyIDs, //O
expirationTime := omit, //O
dynamicAuthorizationConsultationIDs := omit, //TODO Check whether it is optional or mandatory for create operation
dynamicAuthorizationConsultationIDs := omit, //O
announceTo := omit, //O
announcedAttribute := omit, //O
locationSource := PX_LOCATION_SOURCE, //M
......@@ -975,7 +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
dynamicAuthorizationConsultationIDs := omit, //O
announceTo := omit,//O
announcedAttribute := omit,//O
appName := omit,//O
......@@ -986,7 +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
e2eSecInfo := omit, //O
choice := omit//NP
};
......@@ -1022,7 +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
dynamicAuthorizationConsultationIDs := omit, //O
announceTo := omit,//O
announcedAttribute := omit,//O
creator := omit,//NP
......@@ -1083,7 +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
dynamicAuthorizationConsultationIDs := omit, //O
creator := omit,//NP
eventNotificationCriteria := omit,//O
expirationCounter := omit,//O
......@@ -1101,35 +1101,7 @@ module OneM2M_Templates {
subscriberURI := omit,//NP
choice := omit//NP
};
/**
* @desc Base primitiveContent for UPDATE operation for AE resource
*/
template (value) ContentInstance_optional m_contentUpdateContentInstance(XSD.String p_primitiveContent) := {
resourceName := omit,//NP
resourceType := omit,//NP
resourceID := omit,//NP
parentID := omit,//NP
creationTime := omit,//NP
lastModifiedTime := omit,//NP
labels := omit,//O
expirationTime := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//O
stateTag := omit,//NP
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
choice := omit //TODO Check whether it is optional or mandatory for create operation
};
/**
* @desc Base primitiveContent for UPDATE operation for Container resource
*/
......@@ -1143,7 +1115,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
dynamicAuthorizationConsultationIDs := omit, //O
announceTo := omit,//O
announcedAttribute := omit,//O
stateTag := omit,//NP
......@@ -1155,7 +1127,7 @@ module OneM2M_Templates {
currentByteSize := omit,//NP
locationID := omit,//O
ontologyRef := omit,//O
disableRetrieval := omit, //TODO Check whether it is optional or mandatory for create operation
disableRetrieval := omit, //NP
choice := omit//NP
};
......@@ -1170,7 +1142,7 @@ module OneM2M_Templates {
labels := LABELS,//O
accessControlPolicyIDs := p_accessControlPolicyIDs,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //TODO Check whether it is optional or mandatory for create operation
dynamicAuthorizationConsultationIDs := omit, //O
announceTo := omit,//O
announcedAttribute := omit,//O
locationSource := omit,//NP
......@@ -1197,7 +1169,7 @@ module OneM2M_Templates {
labels := *,//O
accessControlPolicyIDs := *,//O
expirationTime := ?,//M
dynamicAuthorizationConsultationIDs := omit, //TODO Check whether it is optional or mandatory for create operation
dynamicAuthorizationConsultationIDs := *, //O
announceTo := *,//O
announcedAttribute := ?,//M
appName := *,//O
......@@ -1208,7 +1180,7 @@ module OneM2M_Templates {
nodeLink := *,//O
requestReachability := ?,//M
contentSerialization := *,//O
e2eSecInfo:= *, //TODO Check whether it is optional or mandatory for create operation
e2eSecInfo:= *, //O
choice := *//O
};
......@@ -1293,7 +1265,7 @@ module OneM2M_Templates {
labels := *,//O
accessControlPolicyIDs := *,//O
expirationTime := ?,//M
dynamicAuthorizationConsultationIDs := *, //TODO Check whether it is optional or mandatory for create operation
dynamicAuthorizationConsultationIDs := *, //O
announceTo := *,//O
announcedAttribute := *,//O
creator := *,//O
......@@ -1318,6 +1290,7 @@ module OneM2M_Templates {
labels := omit,//O
accessControlPolicyIDs := omit,//O
expirationTime := omit,//M
dynamicAuthorizationConsultationIDs := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//M
creator := omit,//O
......@@ -1350,7 +1323,7 @@ module OneM2M_Templates {
choice := {childResource_list := ?} //O
}
template Group_optional mw_contentGroup_rc6 modifies mw_contentGroupBase := {
template Group_optional mw_contentGroup_rc6 modifies mw_contentGroupBase := {
resourceName := omit,//M
resourceType := omit,//M
resourceID := omit,//M
......@@ -1360,6 +1333,7 @@ module OneM2M_Templates {
labels := omit,//O
accessControlPolicyIDs := omit,//O
expirationTime := omit,//M
dynamicAuthorizationConsultationIDs := omit,//O
announceTo := omit,//O
announcedAttribute := omit,//M
creator := omit,//O
......@@ -1477,7 +1451,7 @@ module OneM2M_Templates {
labels := *,//O
accessControlPolicyIDs := *,//O
expirationTime := ?,//M
dynamicAuthorizationConsultationIDs := *, //TODO Check whether it is optional or mandatory for create operation
dynamicAuthorizationConsultationIDs := *, //O
creator := *,//O
eventNotificationCriteria := *,//O
expirationCounter := *,//O
......@@ -1505,7 +1479,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
dynamicAuthorizationConsultationIDs := omit, //O
creator := omit,//O
eventNotificationCriteria := omit,//O
expirationCounter := omit,//O
......@@ -1552,7 +1526,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
dynamicAuthorizationConsultationIDs := omit, //O
creator := omit,//O
eventNotificationCriteria := omit,//O
expirationCounter := omit,//O
......@@ -1590,10 +1564,10 @@ module OneM2M_Templates {
creator := *,//O
contentInfo := *,//O
contentSize := ?,//M
contentRef := *, //TODO Check whether it is optional or mandatory for create operation
contentRef := *, //O
ontologyRef := *,//O
content := ?,//M
choice := * //TODO Check whether it is optional or mandatory for create operation
choice := * //O
};
......@@ -1607,7 +1581,7 @@ module OneM2M_Templates {
labels := *,//O
accessControlPolicyIDs := *,//O
expirationTime := ?,//M
dynamicAuthorizationConsultationIDs := *, //TODO Check whether it is optional or mandatory for create operation
dynamicAuthorizationConsultationIDs := *, //O
announceTo := *,//O
announcedAttribute := *,//O
stateTag := ?,//M
......@@ -1619,7 +1593,7 @@ module OneM2M_Templates {
currentByteSize := ?,//M
locationID := *,//O
ontologyRef := *,//O
disableRetrieval := *, //TODO Check whether it is optional or mandatory for create operation
disableRetrieval := *, //O
choice := *//O
};
......@@ -1633,6 +1607,7 @@ module OneM2M_Templates {
labels := omit,//O
accessControlPolicyIDs := omit,//O
expirationTime := omit,//M
dynamicAuthorizationConsultationIDs := omit, //O
announceTo := omit,//O
announcedAttribute := omit,//M
stateTag := omit,//M
......@@ -1644,6 +1619,7 @@ module OneM2M_Templates {
currentByteSize := omit,//M
locationID := omit,//O
ontologyRef := omit,//O
disableRetrieval := omit, //O
choice := omit//O
}
......@@ -1675,7 +1651,8 @@ module OneM2M_Templates {
labels := omit,//O
accessControlPolicyIDs := omit,//O
expirationTime := omit,//M
announceTo := omit,//O
dynamicAuthorizationConsultationIDs := omit, //O
announceTo := omit,//O
announcedAttribute := omit,//M
stateTag := omit,//M
creator := omit,//M
......@@ -1686,7 +1663,7 @@ module OneM2M_Templates {
currentByteSize := omit,//M
locationID := omit,//O
ontologyRef := omit,//O
disableRetrieval := omit, //TODO Check whether it is optional or mandatory for create operation
disableRetrieval := omit, //O
choice := {childResource_list := ?}//O
}
......@@ -1702,12 +1679,16 @@ module OneM2M_Templates {
accessControlPolicyIDs := omit,
creationTime := omit,
expirationTime := omit,
dynamicAuthorizationConsultationIDs := omit,
announceTo := omit,
announcedAttribute := omit,
appName := omit,
pointOfAccess := omit,
ontologyRef := omit,
requestReachability := omit
nodeLink := omit,
requestReachability := omit,
contentSerialization := omit,
e2eSecInfo := omit
};
template (value) ACP_update_invalid m_contentUpdateAcp_invalid := {
......@@ -1727,6 +1708,7 @@ module OneM2M_Templates {
creationTime := omit,
expirationCounter := omit,
expirationTime := omit,
dynamicAuthorizationConsultationIDs := omit,
announceTo := omit,
announcedAttribute := omit,
maxNrOfMembers := omit,
......@@ -1737,11 +1719,9 @@ module OneM2M_Templates {
template (value) PollingChannel_update_invalid m_contentUpdatePollingChannel_invalid := {
labels := omit,
accessControlPolicyIDs := omit,
creationTime := omit,
expirationCounter := omit,
expirationTime := omit,
pollingChannelURI := omit
expirationTime := omit
};
template (value) Schedule_update_invalid m_contentUpdateSchedule_invalid := {
......@@ -1749,6 +1729,7 @@ module OneM2M_Templates {
creationTime := omit,
expirationCounter := omit,
expirationTime := omit,
dynamicAuthorizationConsultationIDs := omit,
announceTo := omit,
announcedAttribute := omit,
scheduleElement := omit
......@@ -1762,6 +1743,7 @@ module OneM2M_Templates {
expirationTime := omit,
eventNotificationCriteria := omit,
expirationCounter := omit,
dynamicAuthorizationConsultationIDs := omit,
notificationURI := omit,
groupID := omit,
notificationForwardingURI := omit,
......@@ -1773,20 +1755,6 @@ module OneM2M_Templates {
notificationContentType := omit,
notificationEventCat := omit
};
template (value) ContentInstance_update_invalid m_contentUpdateContentInstance_invalid(XSD.String p_primitiveContent) := {
labels := omit,
creationTime := omit,
announceTo := omit,
contentInfo := omit,
contentSize := omit,
ontologyRef := omit,
content_ := {
embed_values := {p_primitiveContent},
attr := omit,
elem_list := {}
}
};
template (value) Container_update_invalid m_contentUpdateContainer_invalid := {
labels := omit,
......@@ -1794,6 +1762,7 @@ module OneM2M_Templates {
creationTime := omit,
expirationCounter := omit,
expirationTime := omit,
dynamicAuthorizationConsultationIDs := omit,
announceTo := omit,
announcedAttribute := omit,
maxNrOfInstances := omit,
......
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