Skip to content

GitLab

Commit 1db49e18 authored by Carre's avatar Carre
Browse files

Merge branch 'master' of https://git.onem2m.org/TST/ATS

parents 75e24b22 da7392e6
Hide whitespace changes
Inline Side-by-side
Showing with 147 additions and 167 deletions
LibOneM2M/OneM2M_Functions.ttcn
View file @ 1db49e18
......@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Functions.ttcn $
* $Id: OneM2M_Functions.ttcn 106 2016-09-01 06:59:26Z reinaortega $
* $Id: OneM2M_Functions.ttcn 116 2016-09-14 07:10:05Z reinaortega $
* @desc Module containing functions for oneM2M
*
*/
......@@ -693,7 +693,7 @@ module OneM2M_Functions {
* @return Internal resource index of the saved resource
* @verdict
*/
function f_setResource(PrimitiveContent p_resource, integer p_parentIndex := -1) runs on CseTester return integer {
function f_setResource(PrimitiveContent p_resource, integer p_parentIndex := -1) runs on Tester return integer {
if(isbound(vc_resourcesList)) {
vc_resourcesList[lengthof(vc_resourcesList)] := {p_parentIndex, p_resource};
......
LibOneM2M/OneM2M_Pixits.ttcn
View file @ 1db49e18
......@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Pixits.ttcn $
* $Id: OneM2M_Pixits.ttcn 103 2016-08-30 09:39:32Z reinaortega $
* $Id: OneM2M_Pixits.ttcn 121 2016-09-27 08:36:54Z reinaortega $
* @desc Module containing Pixits for oneM2M
*
*/
......@@ -18,7 +18,7 @@ module OneM2M_Pixits {
modulepar boolean PX_DELETE_CREATED_RESOURCES := true;
modulepar charstring PX_RESOURCE_TO_BE_DELETED := "/ae_test";
modulepar XSD.AnyURI PX_RESOURCE_TO_BE_DELETED := "/ae_test";
modulepar XSD.IDREFS PX_RESOURCES_TO_BE_DELETED := {"/ae_test", "/MyAcp"};
......@@ -26,15 +26,15 @@ module OneM2M_Pixits {
modulepar charstring PX_XML_NAMESPACE := "om2m=""http://www.onem2m.org/xml/protocols""";
modulepar charstring PX_CSE_NAME := "in-cse";
modulepar XSD.ID PX_CSE_NAME := "in-cse";
modulepar charstring PX_URI_CSE := "/~/in-cse";
modulepar XSD.AnyURI PX_URI_CSE := "/~/in-cse";
modulepar boolean PX_UNSTRUCTURED := false;
modulepar charstring PX_AE_ID_STEM := "admin:admin";
modulepar XSD.ID PX_AE_ID_STEM := "admin:admin";
modulepar charstring PX_APP_ID := "myAppId";
modulepar XSD.ID PX_APP_ID := "myAppId";
modulepar boolean PX_RUN_POSTAMBLE := true;
......@@ -42,21 +42,21 @@ module OneM2M_Pixits {
modulepar AddressingFormat PX_ADDRESSING_FORMAT := e_cseRelative;
modulepar charstring PX_SERIALIZATION := "JSON";
modulepar charstring PX_SERIALIZATION := "XML";
modulepar charstring PX_PROTOCOL_BINDING := "HTTP";
modulepar boolean PX_ACP_SUPPORT := true;
modulepar charstring PX_CSE_ID := "in-cse";
modulepar XSD.ID PX_CSE_ID := "in-cse";
modulepar boolean PX_FROM_IS_AE_ID := false;
//@Martin
//constant parameters for LOC
modulepar LocationSource PX_LOCATION_SOURCE := int1;//network-defined
modulepar charstring PX_LOCATION_TARGET_ID := "{LOCATION-TARGET-ID}"; //SUPPOSE TO BE RECEIVED FROM LOCATION SERVER
modulepar charstring PX_LOCATION_SERVER_ADDRESS := "{LOCATION-SERVER-ADDRESS}";
modulepar XSD.Token PX_LOCATION_TARGET_ID := "{LOCATION-TARGET-ID}"; //SUPPOSE TO BE RECEIVED FROM LOCATION SERVER
modulepar XSD.AnyURI PX_LOCATION_SERVER_ADDRESS := "{LOCATION-SERVER-ADDRESS}";
modulepar charstring PX_LOCATION_UPDATE_PERIOD := "PT10M10S" ;//10 Minute 10 Seconds
modulepar charstring PX_LOCATION_UPDATE_PERIOD_INVALID := "-PT30M10S" ;//duration set to invalid value (minus value)
modulepar charstring PX_LOCATION_CONTAINER_NAME := "myLoContainer";
......
LibOneM2M/OneM2M_Templates.ttcn
View file @ 1db49e18
......@@ -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 121 2016-09-27 08:36:54Z reinaortega $
* @desc Module containing templates for oneM2M
*
*/
......@@ -50,6 +50,19 @@ module OneM2M_Templates {
serialization := PX_SERIALIZATION,
nullFields := p_nullFields
};
/**
* @desc Base template for response sending operations
* @param p_responsePrimitive
*/
template (value) MsgOut m_response(in template (value) ResponsePrimitive p_responsePrimitive, in template (omit) AttributeList_1 p_nullFields := omit ) := {
primitive := { responsePrimitive := p_responsePrimitive},
host := PX_HOST_ADDRESS,
xmlNamespace := PX_XML_NAMESPACE,
protocolBinding := PX_PROTOCOL_BINDING,
serialization := PX_SERIALIZATION,
nullFields := p_nullFields
};
//Added by @Naum
template MsgIn mw_request(in template (present) RequestPrimitive p_requestPrimitive) := {
primitive := { requestPrimitive := p_requestPrimitive}
......@@ -63,7 +76,7 @@ module OneM2M_Templates {
primitive := { responsePrimitive := p_responsePrimitive}
};
}
}//end of group primitives
group RequestPrimitives {
......@@ -79,7 +92,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,
......@@ -695,7 +708,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
......@@ -706,7 +719,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
};
......@@ -765,7 +778,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
......@@ -793,11 +806,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
......@@ -846,20 +859,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
}
......@@ -879,7 +892,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
......@@ -892,7 +905,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
......@@ -952,14 +965,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
};
/**
......@@ -976,7 +989,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
......@@ -988,7 +1001,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
};
......@@ -1003,7 +1016,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
......@@ -1034,7 +1047,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
......@@ -1045,7 +1058,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
};
......@@ -1081,7 +1094,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
......@@ -1142,7 +1155,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
......@@ -1160,35 +1173,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
*/
......@@ -1202,7 +1187,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
......@@ -1214,7 +1199,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
};
......@@ -1229,7 +1214,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
......@@ -1256,7 +1241,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
......@@ -1267,7 +1252,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
};
......@@ -1352,7 +1337,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
......@@ -1377,6 +1362,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
......@@ -1409,7 +1395,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
......@@ -1419,6 +1405,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
......@@ -1536,7 +1523,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
......@@ -1564,7 +1551,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
......@@ -1611,7 +1598,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
......@@ -1649,10 +1636,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
};
......@@ -1666,7 +1653,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
......@@ -1678,7 +1665,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
};
......@@ -1692,6 +1679,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
......@@ -1703,6 +1691,7 @@ module OneM2M_Templates {
currentByteSize := omit,//M
locationID := omit,//O
ontologyRef := omit,//O
disableRetrieval := omit, //O
choice := omit//O
}
......@@ -1734,7 +1723,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
......@@ -1745,7 +1735,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
}
......@@ -1761,12 +1751,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 := {
......@@ -1786,6 +1780,7 @@ module OneM2M_Templates {
creationTime := omit,
expirationCounter := omit,
expirationTime := omit,
dynamicAuthorizationConsultationIDs := omit,
announceTo := omit,
announcedAttribute := omit,
maxNrOfMembers := omit,
......@@ -1796,11 +1791,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 := {
......@@ -1808,6 +1801,7 @@ module OneM2M_Templates {
creationTime := omit,
expirationCounter := omit,
expirationTime := omit,
dynamicAuthorizationConsultationIDs := omit,
announceTo := omit,
announcedAttribute := omit,
scheduleElement := omit
......@@ -1819,6 +1813,7 @@ module OneM2M_Templates {
creationTime := omit,
maxNrOfInstances := omit,
expirationTime := omit,
dynamicAuthorizationConsultationIDs := omit,
eventNotificationCriteria := omit,
expirationCounter := omit,
notificationURI := omit,
......@@ -1832,20 +1827,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,
......@@ -1853,6 +1834,7 @@ module OneM2M_Templates {
creationTime := omit,
expirationCounter := omit,
expirationTime := omit,
dynamicAuthorizationConsultationIDs := omit,
announceTo := omit,
announcedAttribute := omit,
maxNrOfInstances := omit,
......
LibOneM2M/OneM2M_Types.ttcn
View file @ 1db49e18
......@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Types.ttcn $
* $Id: OneM2M_Types.ttcn 113 2016-09-09 07:11:54Z reinaortega $
* $Id: OneM2M_Types.ttcn 119 2016-09-20 13:40:03Z reinaortega $
* @desc Test System module for oneM2M
*
*/
......@@ -1895,7 +1895,7 @@ type record AccessControlRule
record length(1 .. infinity) of Ipv6 ipv6Addresses
} accessControlIpAddresses optional,
LocationRegion accessControlLocationRegion optional
} accessControlContexts_list optional, //TODO
} accessControlContexts_list optional,
XSD.Boolean accessControlAuthenticationFlag optional
}
with {
......@@ -6933,12 +6933,16 @@ group invalidTypes {
AcpType accessControlPolicyIDs optional,
Timestamp creationTime optional,//Invalid field to be used for BI tests
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
record of XSD.Token announcedAttribute optional,
XSD.String appName optional,
PoaList pointOfAccess optional,
XSD.AnyURI ontologyRef optional,
XSD.Boolean requestReachability optional
XSD.AnyURI nodeLink optional,
XSD.Boolean requestReachability optional,
Serializations contentSerialization optional,
E2eSecInfo e2eSecInfo optional
};
type record ACP_update_invalid {
......@@ -6959,6 +6963,7 @@ group invalidTypes {
Timestamp creationTime optional,//Invalid field to be used for BI tests (RO attributes)
XSD.PositiveInteger expirationCounter optional,//Invalid field, non existing for Container
Timestamp expirationTime optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
record of XSD.Token announcedAttribute optional,
XSD.NonNegativeInteger maxNrOfInstances optional,
......@@ -6967,69 +6972,59 @@ group invalidTypes {
XSD.AnyURI locationID optional,
XSD.AnyURI ontologyRef optional
}
//TODO To double check
type record ContentInstance_update_invalid {
type record Group_update_invalid {
Labels labels optional,
AcpType accessControlPolicyIDs optional,
Timestamp creationTime optional,//Invalid field to be used for BI tests