Moved to XSD 2.13.0 and the corresponding adaptation to the new types

Signed-off-by: Miguel Angel Reina Ortega's avatarMiguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
parent 90051efc
......@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Templates.ttcn $
* $Id: OneM2M_Templates.ttcn 344 2017-08-07 14:11:47Z reinaortega $
* $Id: OneM2M_Templates.ttcn 350 2017-08-11 13:44:16Z reinaortega $
* @desc Module containing templates for oneM2M
*
*/
......@@ -1267,6 +1267,7 @@ module OneM2M_Templates {
supportedResourceType := omit,
pointOfAccess := omit,
nodeLink := omit,
dynamicAuthorizationConsultationIDs := omit,
e2eSecInfo := omit,
choice := omit
};
......@@ -1738,8 +1739,8 @@ module OneM2M_Templates {
trigger_Recipient_ID := omit,//O
requestReachability := true,//M
nodeLink := omit,//O
e2eSecInfo := omit,//O
triggerReferenceNumber := omit,//O
e2eSecInfo := omit,//O
choice := omit//O
};
......@@ -2081,6 +2082,7 @@ module OneM2M_Templates {
supportedResourceType := omit,
pointOfAccess := omit,
nodeLink := omit,
dynamicAuthorizationConsultationIDs := omit,
e2eSecInfo := omit,
choice := omit
......@@ -2266,8 +2268,8 @@ module OneM2M_Templates {
trigger_Recipient_ID := omit,
requestReachability := omit,
nodeLink := omit,
e2eSecInfo := omit,
triggerReferenceNumber := omit,
e2eSecInfo := omit,
choice := omit
}
......@@ -2724,8 +2726,8 @@ module OneM2M_Templates {
trigger_Recipient_ID := omit,//O
requestReachability := omit,//M
nodeLink := omit,//O
e2eSecInfo := omit,//O
triggerReferenceNumber := omit,//O
e2eSecInfo := omit,//O
choice := omit//O
};
......@@ -2750,8 +2752,8 @@ module OneM2M_Templates {
trigger_Recipient_ID := *,//O
requestReachability := ?,//M
nodeLink := *,//O
e2eSecInfo := *,//O
triggerReferenceNumber := *,//O
e2eSecInfo := *,//O
choice := *//O
};
......@@ -3280,6 +3282,7 @@ module OneM2M_Templates {
supportedResourceType := ?,//M
pointOfAccess := ?,//M
nodeLink := *,//O
dynamicAuthorizationConsultationIDs := omit,
e2eSecInfo := *,//O
choice := *//O
};
......@@ -3294,101 +3297,158 @@ module OneM2M_Templates {
group SpecialContents {
template (value) AE_update_invalid m_contentUpdateAe_invalid := {
labels := omit,
accessControlPolicyIDs := omit,
creationTime := omit,
expirationTime := omit,
dynamicAuthorizationConsultationIDs := omit,
announceTo := omit,
announcedAttribute := omit,
appName := omit,
pointOfAccess := omit,
ontologyRef := omit,
nodeLink := omit,
requestReachability := omit,
contentSerialization := omit,
e2eSecInfo := omit
resourceName := omit,//M
resourceType := omit,//M
resourceID := omit,//M
parentID := omit,//M
creationTime := omit,//M
lastModifiedTime := omit,//M
expirationCounter := omit,//Invalid
labels := omit,//O
accessControlPolicyIDs := omit,//O
expirationTime := omit,//M
dynamicAuthorizationConsultationIDs := omit, //O
announceTo := omit,//O
announcedAttribute := omit,//O
appName := omit,//O
app_ID := omit,//M
aE_ID := omit,//M
pointOfAccess := omit,//O
ontologyRef := omit,//O
nodeLink := omit,//O
requestReachability := omit,//M
contentSerialization := omit,//O
e2eSecInfo:= omit, //O
choice := omit//O
};
template (value) ACP_update_invalid m_contentUpdateAcp_invalid := {
labels := omit,
expirationTime := omit,
creationTime := omit,
expirationCounter := omit,
announceTo := omit,
announcedAttribute := omit,
privileges := omit,
selfPrivileges := omit
resourceName := omit,//M
resourceType := omit,//M
resourceID := omit,//M
parentID := omit,//M
creationTime := omit,//M
lastModifiedTime := omit,//M
expirationCounter := omit,//Invalid
labels := omit,//O
expirationTime := omit,//M
announceTo := omit,//O
announcedAttribute := omit,//M
privileges := omit,//M
selfPrivileges := omit,//M
choice := omit//O
};
template (value) Group_update_invalid m_contentUpdateGroup_invalid := {
labels := omit,
accessControlPolicyIDs := omit,
creationTime := omit,
expirationCounter := omit,
expirationTime := omit,
dynamicAuthorizationConsultationIDs := omit,
announceTo := omit,
announcedAttribute := omit,
maxNrOfMembers := omit,
memberIDs := omit,
membersAccessControlPolicyIDs := omit,
groupName := omit
resourceName := omit,//M
resourceType := omit,//M
resourceID := omit,//M
parentID := omit,//M
creationTime := omit,//M
lastModifiedTime := omit,//M
expirationCounter := omit,//Invalid
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
choice := omit//O
};
template (value) PollingChannel_update_invalid m_contentUpdatePollingChannel_invalid := {
labels := omit,
creationTime := omit,
expirationCounter := omit,
expirationTime := omit
resourceName := omit,//M
resourceType := omit,//M
resourceID := omit,//M
parentID := omit,//M
creationTime := omit,//M
lastModifiedTime := omit,//M
expirationCounter := omit,//Invalid
labels := omit,//O
expirationTime := omit//M
};
template (value) Schedule_update_invalid m_contentUpdateSchedule_invalid := {
labels := omit,
creationTime := omit,
expirationCounter := omit,
expirationTime := omit,
dynamicAuthorizationConsultationIDs := omit,
announceTo := omit,
announcedAttribute := omit,
scheduleElement := omit
resourceName := omit,//M
resourceType := omit,//M
resourceID := omit,//M
parentID := omit,//M
creationTime := omit,//M
lastModifiedTime := omit,//M
expirationCounter := omit,//Invalid
labels := omit,//O
expirationTime := omit,//M
announceTo := omit,//O
announcedAttribute := omit,//M
scheduleElement := omit,//M
choice := omit//O
};
template (value) Subscription_update_invalid m_contentUpdateSubscription_invalid := {
labels := omit,
accessControlPolicyIDs := omit,
creationTime := omit,
maxNrOfInstances := omit,
expirationTime := omit,
dynamicAuthorizationConsultationIDs := omit,
eventNotificationCriteria := omit,
expirationCounter := omit,
notificationURI := omit,
groupID := omit,
notificationForwardingURI := omit,
batchNotify := omit,
rateLimit := omit,
pendingNotification := omit,
notificationStoragePriority := omit,
latestNotify := omit,
notificationContentType := omit,
notificationEventCat := omit
resourceName := omit,//M
resourceType := omit,//M
resourceID := omit,//M
parentID := omit,//M
creationTime := omit,//M
lastModifiedTime := omit,//M
maxNrOfInstances := omit,//Invalid
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
choice := omit//O
};
template (value) Container_update_invalid m_contentUpdateContainer_invalid := {
labels := omit,
accessControlPolicyIDs := omit,
creationTime := omit,
expirationCounter := omit,
expirationTime := omit,
dynamicAuthorizationConsultationIDs := omit,
announceTo := omit,
announcedAttribute := omit,
maxNrOfInstances := omit,
maxByteSize := omit,
maxInstanceAge := omit,
locationID := omit,
ontologyRef := omit
resourceName := omit,//M
resourceType := omit,//M
resourceID := omit,//M
parentID := omit,//M
creationTime := omit,//M
lastModifiedTime := omit,//M
expirationCounter := omit,//Invalid
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 := omit//O
};
}//end group SpecialContents
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -6,7 +6,7 @@
* All rights reserved.
*
* @author oneM2M
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/UsefulTtcn3Types.ttcn $
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/UsefulTtcn3Types.ttcn $
* $Id: UsefulTtcn3Types.ttcn 234 2017-03-20 16:37:29Z reinaortega $
* @desc Useful types
*
......
......@@ -6,7 +6,7 @@
* All rights reserved.
*
* @author oneM2M
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/XSD.ttcn $
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/XSD.ttcn $
* $Id: XSD.ttcn 234 2017-03-20 16:37:29Z reinaortega $
* @desc XSD Aux
*
......
......@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Testcases.ttcn $
* $Id: OneM2M_Testcases.ttcn 346 2017-08-08 12:49:09Z reinaortega $
* $Id: OneM2M_Testcases.ttcn 349 2017-08-11 13:18:28Z reinaortega $
* @desc Module containing test cases for oneM2M
*
*/
......@@ -14017,7 +14017,7 @@ module OneM2M_Testcases {
mcaPort.send(m_request(v_createRequest));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int6011))) -> value v_response {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4110))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": unsuccessful validation of the resource type during the creation of the group");
}
......@@ -14808,7 +14808,7 @@ module OneM2M_Testcases {
mcaPort.send(m_request(v_updateRequest));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int6011))) -> value v_response {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4110))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": unsuccessful validation of the resource type during the creation of the group");
}
......
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