diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 76a5bcad42f6e328287df9e69c0682782757c1d0..599eed6a577dcb8758962fe017c284ef78bc6e54 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Functions.ttcn $
- * $Id: OneM2M_Functions.ttcn 169 2016-11-21 09:45:43Z reinaortega $
+ * $Id: OneM2M_Functions.ttcn 170 2016-11-21 15:53:54Z reinaortega $
* @desc Module containing functions for oneM2M
*
*/
@@ -494,8 +494,9 @@ module OneM2M_Functions {
{
accessControlOriginators := PX_ACOR, //{"admin:admin"}
accessControlOperations := valueof(p_allowedOperations),
- accessControlContexts_list := omit,
- accessControlAuthenticationFlag := omit
+ accessControlContexts_list := {},
+ accessControlAuthenticationFlag := omit,
+ accessControlObjectDetails_list := {}
}
};
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 7142ab4e8a32721c6daba8c29928c89168f4d25a..03ad1d015a7faf6607e095328c7c9901eddbf44d 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 167 2016-11-18 10:54:25Z reinaortega $
+ * $Id: OneM2M_Templates.ttcn 170 2016-11-21 15:53:54Z reinaortega $
* @desc Module containing templates for oneM2M
*
*/
@@ -108,7 +108,7 @@ module OneM2M_Templates {
tokens := omit,
tokenIDs := omit,
localTokenIDs := omit,
- tokenReqIndicator := omit
+ tokenRequestIndicator := omit
};
/**
@@ -139,7 +139,7 @@ module OneM2M_Templates {
tokens := omit,
tokenIDs := omit,
localTokenIDs := omit,
- tokenReqIndicator := omit
+ tokenRequestIndicator := omit
};
/**
@@ -170,7 +170,7 @@ module OneM2M_Templates {
tokens := omit,
tokenIDs := omit,
localTokenIDs := omit,
- tokenReqIndicator := omit
+ tokenRequestIndicator := omit
};
/**
@@ -204,7 +204,7 @@ module OneM2M_Templates {
tokens := omit,
tokenIDs := omit,
localTokenIDs := omit,
- tokenReqIndicator := omit
+ tokenRequestIndicator := omit
};
}//end group Retrieve
@@ -233,7 +233,7 @@ module OneM2M_Templates {
tokens := omit,
tokenIDs := omit,
localTokenIDs := omit,
- tokenReqIndicator := omit
+ tokenRequestIndicator := omit
};
/**
@@ -358,7 +358,7 @@ module OneM2M_Templates {
tokens := omit,
tokenIDs := omit,
localTokenIDs := omit,
- tokenReqIndicator := omit
+ tokenRequestIndicator := omit
};
@@ -391,11 +391,11 @@ module OneM2M_Templates {
tokens := *,
tokenIDs := *,
localTokenIDs := *,
- tokenReqIndicator := *
+ tokenRequestIndicator := *
};
//Added by @Naum
- template (value) RequestPrimitive m_createAe(XSD.ID p_appId, template (omit) AcpType p_accessControlPolicyIDs := omit,template (omit) XSD.ID p_from := omit, template (omit) XSD.NCName p_resourceName := c_aeAuxName, in template (omit) PoaList p_poaList := omit) modifies m_create := {
+ template (value) RequestPrimitive m_createAe(XSD.ID p_appId, template (omit) AcpType p_accessControlPolicyIDs := omit,template (omit) XSD.ID p_from := omit, template (omit) ResourceName p_resourceName := c_aeAuxName, in template (omit) PoaList p_poaList := omit) modifies m_create := {
from_ := p_from,//PX_AE_ID_STEM,//TODO We should use omit, "s", or "c"
requestIdentifier := "m_createAe" & f_rnd(1, 1000000),
resourceType := int2,
@@ -648,7 +648,7 @@ module OneM2M_Templates {
tokens := omit,
tokenIDs := omit,
localTokenIDs := omit,
- tokenReqIndicator := omit
+ tokenRequestIndicator := omit
};
@@ -675,7 +675,7 @@ module OneM2M_Templates {
tokens := omit,
tokenIDs := omit,
localTokenIDs := omit,
- tokenReqIndicator := omit
+ tokenRequestIndicator := omit
};
@@ -709,7 +709,7 @@ module OneM2M_Templates {
tokens := *,
tokenIDs := *,
localTokenIDs := *,
- tokenReqIndicator := *
+ tokenRequestIndicator := *
};
/**
@@ -738,7 +738,7 @@ module OneM2M_Templates {
tokens := *,
tokenIDs := *,
localTokenIDs := *,
- tokenReqIndicator := *
+ tokenRequestIndicator := *
};
/**
@@ -844,8 +844,9 @@ module OneM2M_Templates {
template (value) AccessControlRule m_createAcr (in template (value) ListOfURIs p_acor, in template (value) AccessControlOperations p_allowedOperations) := {
accessControlOriginators := p_acor,//{"*"},//{PX_AE_ID_STEM}, //{"admin:admin"},
accessControlOperations := p_allowedOperations,
- accessControlContexts_list := omit,
- accessControlAuthenticationFlag := omit
+ accessControlContexts_list := {},
+ accessControlAuthenticationFlag := omit,
+ accessControlObjectDetails_list := {}
}
//added by @Naum
@@ -1012,7 +1013,7 @@ module OneM2M_Templates {
subscriberURI := p_subscriberURI//O
};
- template (value) EventNotificationCriteria m_eventNotificationCriteria ( in NotificationEventType p_notificationEventType, in EventNotificationCriteria.attribute_list p_attribute_list := {}) := { //the parameter should be a list of NotificationEventTypeEventType
+ template (value) EventNotificationCriteria m_eventNotificationCriteria ( in EventNotificationCriteria.notificationEventType_list p_notificationEventType_list := {}, in EventNotificationCriteria.attribute p_attribute_list := {}) := { //the parameter should be a list of NotificationEventTypeEventType
createdBefore := omit,
createdAfter := omit,
modifiedSince := omit,
@@ -1024,8 +1025,8 @@ module OneM2M_Templates {
sizeAbove := omit,
sizeBelow := omit,
operationMonitor_list := {},
- attribute_list := p_attribute_list, // TODO this list should be able to be omited see 9.6.8
- notificationEventType_list := {p_notificationEventType},// TODO this list should be able to be omited see 9.6.8 (TS0001)
+ attribute := p_attribute_list, // TODO this list should be able to be omited see 9.6.8
+ notificationEventType_list := p_notificationEventType_list,// TODO this list should be able to be omited see 9.6.8 (TS0001)
missingData := omit
};
@@ -2033,7 +2034,7 @@ module OneM2M_Templates {
contentStatus := *,
contentOffset := *,
assignedTokenIdentifiers := *,
- tokenReqInfo := *
+ tokenRequestInformation := *
};
template ResponsePrimitive mw_responsePrimitiveInverse(ResponseStatusCode p_statusCode) := {
@@ -2048,7 +2049,7 @@ module OneM2M_Templates {
contentStatus := *,
contentOffset := *,
assignedTokenIdentifiers := *,
- tokenReqInfo := *
+ tokenRequestInformation := *
};
template ResponsePrimitive mw_responsePrimitiveOK(in template PrimitiveContent p_content := *) := {
@@ -2063,7 +2064,7 @@ module OneM2M_Templates {
contentStatus := *,
contentOffset := *,
assignedTokenIdentifiers := *,
- tokenReqInfo := *
+ tokenRequestInformation := *
};
template ResponsePrimitive mw_responsePrimitiveKO := {
@@ -2078,7 +2079,7 @@ module OneM2M_Templates {
contentStatus := *,
contentOffset := *,
assignedTokenIdentifiers := *,
- tokenReqInfo := *
+ tokenRequestInformation := *
};
group Notify{
@@ -2095,7 +2096,7 @@ module OneM2M_Templates {
contentStatus := omit,
contentOffset := omit,
assignedTokenIdentifiers := omit,
- tokenReqInfo := omit
+ tokenRequestInformation := omit
};
}
diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index cfafdbd1c3df5bc7dba5d11c746c54a573de3956..9821617c9d28106576bd0eb488fbca2c06e3d173 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 165 2016-11-17 14:52:31Z reinaortega $
+ * $Id: OneM2M_Types.ttcn 170 2016-11-21 15:53:54Z reinaortega $
* @desc Test System module for oneM2M
*
*/
@@ -19,7 +19,7 @@ import from XSD all;
type record AccessControlPolicy
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -51,7 +51,7 @@ with {
type record AccessControlPolicyAnnc
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -87,7 +87,7 @@ with {
type record ActiveCmdhPolicy
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -115,7 +115,7 @@ with {
type record AE
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -171,7 +171,7 @@ with {
type record AEAnnc
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -180,8 +180,8 @@ type record AEAnnc
Labels labels optional,
AcpType accessControlPolicyIDs,
Timestamp expirationTime,
- ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.AnyURI link,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.String appName optional,
XSD.String app_ID optional,
XSD.ID aE_ID optional,
@@ -229,7 +229,7 @@ with {
type record AllJoynApp
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -269,7 +269,7 @@ with {
type record AllJoynAppAnnc
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -309,7 +309,7 @@ with {
type record AllJoynInterface
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -351,7 +351,7 @@ with {
type record AllJoynInterfaceAnnc
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -395,7 +395,7 @@ with {
type record AllJoynMethodCall
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -436,7 +436,7 @@ with {
type record AllJoynMethodCallAnnc
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -473,7 +473,7 @@ with {
type record AllJoynMethod
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -512,7 +512,7 @@ with {
type record AllJoynMethodAnnc
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -551,7 +551,7 @@ with {
type record AllJoynProperty
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -591,7 +591,7 @@ with {
type record AllJoynPropertyAnnc
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -628,7 +628,7 @@ with {
type record AllJoynSvcObject
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -671,7 +671,7 @@ with {
type record AllJoynSvcObjectAnnc
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -714,7 +714,7 @@ with {
type record AreaNwkDeviceInfo
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -757,7 +757,7 @@ with {
type record AreaNwkDeviceInfoAnnc
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -798,7 +798,7 @@ with {
type record AreaNwkInfo
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -836,7 +836,7 @@ with {
type record AreaNwkInfoAnnc
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -872,7 +872,7 @@ with {
type record Battery
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -910,7 +910,7 @@ with {
type record BatteryAnnc
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -946,7 +946,7 @@ with {
type record CmdhBuffer
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -976,7 +976,7 @@ with {
type record CmdhDefaults
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -1006,7 +1006,7 @@ with {
type record CmdhDefEcValue
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -1041,7 +1041,7 @@ with {
type record CmdhEcDefParamValues
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -1076,7 +1076,7 @@ with {
type record CmdhLimits
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -1123,7 +1123,7 @@ with {
type record CmdhNetworkAccessRules
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -1154,7 +1154,7 @@ with {
type record CmdhNwAccessRule
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -1187,7 +1187,7 @@ with {
type record CmdhPolicy
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -1419,7 +1419,7 @@ with {
};
-type XSD.String ContentInfo //(pattern "[\w/!#$\^_.+\q{0, 0, 0, 38}&\-]+((:[0-2])#(0,1))+((:[0-5])#(0,1))") TODO To verify pattern
+type XSD.String ContentInfo //FIXME To be fixed (pattern "[\w/!#$\^_.+\q{0, 0, 0, 38}&\-]+((:[0-2])#(0,1))+((:[0-5])#(0,1))") TODO To verify pattern
with {
variant "name as uncapitalized";
};
@@ -1471,7 +1471,7 @@ with {
};
-type XSD.String ScheduleEntry //FIXME To be added (pattern "(([*]|[1-5]#(0,1)\d([,-/][1-5]#(0,1)\d)*)[\q{0,0,0,20}\q{0,0,0,10}\t\r]+)#(2)([*]|((1#(0,1)\d|2[0-3])([,-/](1#(0,1)\d|2[0-3]))*))[\q{0,0,0,20}\q{0,0,0,10}\t\r]+([*]|(([1-9]|1\d|2\d|3[01])([,-/]([1-9]|1\d|2\d|3[01]))*))[\q{0,0,0,20}\q{0,0,0,10}\t\r]+([*]|(([1-9]|1[0-2])([,-/]([1-9]|1[0-2]))*))[\q{0,0,0,20}\q{0,0,0,10}\t\r]+([*]|([0-6]([,-/][0-6])*))[\q{0,0,0,20}\q{0,0,0,10}\t\r]+([*]|([2-9]\d\d\d)(([,-]([2-9]\d\d\d)([/][\d]#(0,1)[\d]#(0,1)[\d]#(0,1)[\d])#(0,1))*))")
+type XSD.String ScheduleEntry //FIXME To be fixed (pattern "(([*]|[1-5]#(0,1)\d([,-/][1-5]#(0,1)\d)*)[\q{0,0,0,20}\q{0,0,0,10}\t\r]+)#(2)([*]|((1#(0,1)\d|2[0-3])([,-/](1#(0,1)\d|2[0-3]))*))[\q{0,0,0,20}\q{0,0,0,10}\t\r]+([*]|(([1-9]|1\d|2\d|3[01])([,-/]([1-9]|1\d|2\d|3[01]))*))[\q{0,0,0,20}\q{0,0,0,10}\t\r]+([*]|(([1-9]|1[0-2])([,-/]([1-9]|1[0-2]))*))[\q{0,0,0,20}\q{0,0,0,10}\t\r]+([*]|([0-6]([,-/][0-6])*))[\q{0,0,0,20}\q{0,0,0,10}\t\r]+([*]|([2-9]\d\d\d)(([,-]([2-9]\d\d\d)([/][\d]#(0,1)[\d]#(0,1)[\d]#(0,1)[\d])#(0,1))*))")
with {
variant "name as uncapitalized";
};
@@ -1542,6 +1542,12 @@ with {
};
+type XSD.String ResourceName (pattern "[a-zA-Z0-9]([a-zA-Z0-9.\-,_]*)")
+with {
+ variant "name as uncapitalized";
+};
+
+
@@ -1595,12 +1601,23 @@ type record MetaInformation
XSD.Boolean deliveryAggregation optional,
XSD.String groupRequestIdentifier optional,
FilterCriteria filterCriteria optional,
- DiscResType discoveryResultType optional
+ DiscResType discoveryResultType optional,
+ record length(1 .. infinity) of RoleID roleIDs,
+ XSD.Boolean tokenRequestIndicator optional,
+ record length(1 .. infinity) of DynAuthJWT tokens,
+ record length(1 .. infinity) of TokenID tokenIDs,
+ record length(1 .. infinity) of XSD.NCName localTokenIDs
}
with {
variant "name as uncapitalized";
//variant (deliveryAggregation) "text 'true' as '1'";
//variant (deliveryAggregation) "text 'false' as '0'";
+ variant (roleIDs) "list";
+ //variant (tokenRequestIndicator) "text 'true' as '1'";
+ //variant (tokenRequestIndicator) "text 'false' as '0'";
+ variant (tokens) "list";
+ variant (tokenIDs) "list";
+ variant (localTokenIDs) "list";
};
@@ -1624,8 +1641,6 @@ with {
};
-
-
type record FilterCriteria
{
Timestamp createdBefore optional,
@@ -1858,7 +1873,7 @@ with {
type record MgmtLinkRef
{
- XSD.NCName name,
+ ResourceName name,
MgmtDefinition type_,
XSD.AnyURI base
}
@@ -1891,16 +1906,21 @@ type record AccessControlRule
record of record {
record of ScheduleEntry accessControlWindow_list,
record {
- record length(1 .. infinity) of Ipv4 ipv4Addresses,
- record length(1 .. infinity) of Ipv6 ipv6Addresses
+ record length(1 .. infinity) of Ipv4 ipv4Addresses optional,//FIXME It must be optional
+ record length(1 .. infinity) of Ipv6 ipv6Addresses optional//FIXME It must be optional
} accessControlIpAddresses optional,
LocationRegion accessControlLocationRegion optional
- } accessControlContexts_list optional,
- XSD.Boolean accessControlAuthenticationFlag optional
+ } accessControlContexts_list,
+ XSD.Boolean accessControlAuthenticationFlag optional,
+ record of record {
+ ResourceType resourceType optional,
+ XSD.AnyURI specializationID optional,
+ record length(1 .. infinity) of ResourceType childResourceType
+ } accessControlObjectDetails_list
}
with {
variant "name as uncapitalized";
- //variant (accessControlContexts_list) "untagged";
+ variant (accessControlContexts_list) "untagged";
variant (accessControlContexts_list[-]) "name as 'accessControlContexts'";
variant (accessControlContexts_list[-].accessControlWindow_list) "untagged";
variant (accessControlContexts_list[-].accessControlWindow_list[-]) "name as 'accessControlWindow'";
@@ -1908,12 +1928,15 @@ with {
variant (accessControlContexts_list[-].accessControlIpAddresses.ipv6Addresses) "list";
//variant (accessControlAuthenticationFlag) "text 'true' as '1'";
//variant (accessControlAuthenticationFlag) "text 'false' as '0'";
+ variant (accessControlObjectDetails_list) "untagged";
+ variant (accessControlObjectDetails_list[-]) "name as 'accessControlObjectDetails'";
+ variant (accessControlObjectDetails_list[-].childResourceType) "list";
};
type record ChildResourceRef
{
- XSD.NCName name,
+ ResourceName name,
XSD.AnyURI specializationID optional,
ResourceType type_,
XSD.AnyURI base
@@ -2232,7 +2255,7 @@ with {
type record Resource_1
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -2248,7 +2271,7 @@ with {
type record RegularResource
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -2267,7 +2290,7 @@ with {
type record AnnounceableResource
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -2289,7 +2312,7 @@ with {
type record AnnouncedResource
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -2309,7 +2332,7 @@ with {
type record AnnounceableSubordinateResource
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -2329,7 +2352,7 @@ with {
type record SubordinateResource
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -2346,7 +2369,7 @@ with {
type record AnnouncedSubordinateResource
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -2364,7 +2387,7 @@ with {
type record MgmtResource
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -2390,7 +2413,7 @@ with {
type record AnnouncedMgmtResource
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -2423,7 +2446,7 @@ with {
type record FlexContainerResource
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -2448,7 +2471,7 @@ with {
type record AnnouncedFlexContainerResource
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -2692,7 +2715,7 @@ with {
type record Container
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -2742,7 +2765,7 @@ with {
type record ContainerAnnc
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -2793,7 +2816,7 @@ with {
type record ContentInstance
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -2830,7 +2853,7 @@ with {
type record ContentInstanceAnnc
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -2863,7 +2886,7 @@ with {
type record CSEBase
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -2920,7 +2943,7 @@ with {
type record Delivery
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -2958,7 +2981,7 @@ with {
type record DeviceCapability
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -3008,7 +3031,7 @@ with {
type record DeviceCapabilityAnnc
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -3056,7 +3079,7 @@ with {
type record DeviceInfo
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -3099,7 +3122,7 @@ with {
type record DeviceInfoAnnc
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -3140,7 +3163,7 @@ with {
type record DynamicAuthorizationConsultation
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -3507,6 +3530,7 @@ with {
type enumerated ExecResultType
{
+ int0(0),
int1(1),
int2(2),
int3(3),
@@ -3534,7 +3558,8 @@ type enumerated ExecResultType
int27(27),
int28(28),
int29(29),
- int30(30)
+ int30(30),
+ int31(31)
}
with {
variant "useNumber";
@@ -3958,7 +3983,7 @@ with {
type record EventConfig
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -3995,7 +4020,7 @@ with {
type record EventLog
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -4040,7 +4065,7 @@ with {
type record EventLogAnnc
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -4083,7 +4108,7 @@ with {
type record ExecInstance
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -4123,7 +4148,7 @@ with {
type record Firmware
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -4167,7 +4192,7 @@ with {
type record FirmwareAnnc
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -4209,7 +4234,7 @@ with {
type record GenericInterworkingOperationInstance
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -4253,7 +4278,7 @@ with {
type record GenericInterworkingOperationInstanceAnnc
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -4296,7 +4321,7 @@ with {
type record GenericInterworkingService
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -4313,8 +4338,8 @@ type record GenericInterworkingService
XSD.AnyURI containerDefinition,
XSD.AnyURI ontologyRef optional,
XSD.String serviceName,
- XSD.ID inputDataPointLinks optional,
- PoaList outputDataPointLinks optional,
+ ListOfDataLinks inputDataPointLinks optional,
+ ListOfDataLinks outputDataPointLinks optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record of union {
@@ -4339,7 +4364,7 @@ with {
type record GenericInterworkingServiceAnnc
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -4353,7 +4378,7 @@ type record GenericInterworkingServiceAnnc
XSD.NonNegativeInteger stateTag optional,
XSD.AnyURI containerDefinition,
XSD.AnyURI ontologyRef optional,
- XSD.String serviceName optional,
+ XSD.String serviceName,
ListOfDataLinks inputDataPointLinks optional,
ListOfDataLinks outputDataPointLinks optional,
union {
@@ -4381,7 +4406,7 @@ with {
type record Group
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -4399,7 +4424,7 @@ type record Group
XSD.PositiveInteger maxNrOfMembers,
ListOfURIs memberIDs,
ListOfURIs membersAccessControlPolicyIDs optional,
- XSD.Boolean memberTypeValidated,
+ XSD.Boolean memberTypeValidated optional,
ConsistencyStrategy consistencyStrategy optional,
XSD.String groupName optional,
union {
@@ -4427,7 +4452,7 @@ with {
type record GroupAnnc
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -4472,7 +4497,7 @@ with {
type record LocationPolicy
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -4513,7 +4538,7 @@ with {
type record LocationPolicyAnnc
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -4541,7 +4566,7 @@ with {
type record M2mServiceSubscriptionProfile
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -4573,7 +4598,7 @@ with {
type record Memory
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -4611,7 +4636,7 @@ with {
type record MemoryAnnc
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -4647,7 +4672,7 @@ with {
type record MgmtCmd
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -4690,7 +4715,7 @@ with {
type record Node
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -4740,7 +4765,7 @@ with {
type record NodeAnnc
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -4787,7 +4812,7 @@ with {
type record NotificationTargetMgmtPolicyRef
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -4818,7 +4843,7 @@ with {
type record NotificationTargetPolicy
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -4877,6 +4902,7 @@ with {
variant (notification_list[-]) "name as 'notification'";
};
+//FIXME To be added
type union Representation {
anytype resource,
ResponsePrimitive responsePrimitive
@@ -4885,7 +4911,7 @@ type union Representation {
type record Notification_1
{
record {
- //XSD.AnyType representation optional,
+ //XSD.AnyType representation optional, To be exchanged by Representation
Representation representation optional,
record {
Operation operation optional,
@@ -4955,7 +4981,7 @@ type record DynAuthDasResponse
SetOfAcrs grantedPrivileges optional,
AbsRelTimestamp privilegesLifetime optional
} dynamicACPInfo optional,
- record length(1 .. infinity) of DynAuthJWT tokens optional//it must be optional
+ record length(1 .. infinity) of DynAuthJWT tokens
}
with {
variant "name as uncapitalized";
@@ -4965,7 +4991,7 @@ with {
type record PolicyDeletionRules
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -4996,7 +5022,7 @@ with {
type record PollingChannel
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -5014,7 +5040,7 @@ with {
type record Reboot
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -5056,7 +5082,7 @@ with {
type record RebootAnnc
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -5096,7 +5122,7 @@ with {
type record RemoteCSE
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -5163,7 +5189,7 @@ with {
type record RemoteCSEAnnc
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -5242,10 +5268,10 @@ type record RequestPrimitive
XSD.String groupRequestIdentifier optional,
FilterCriteria filterCriteria optional,
DiscResType discoveryResultType optional,
- DynAuthJWT tokens optional,
- TokenID tokenIDs optional,
- record length(1 .. infinity) of XSD.NCName localTokenIDs optional, //TODO it must be optional
- XSD.Boolean tokenReqIndicator optional
+ record length(1 .. infinity) of DynAuthJWT tokens optional,//TODO it must be optional
+ record length(1 .. infinity) of TokenID tokenIDs optional,//TODO it must be optional
+ record length(1 .. infinity) of XSD.NCName localTokenIDs optional,//TODO it must be optional
+ XSD.Boolean tokenRequestIndicator optional
}
with {
variant "name as uncapitalized";
@@ -5255,9 +5281,11 @@ with {
variant (roleIDs) "list";
//variant (deliveryAggregation) "text 'true' as '1'";
//variant (deliveryAggregation) "text 'false' as '0'";
+ variant (tokens) "list";
+ variant (tokenIDs) "list";
variant (localTokenIDs) "list";
- //variant (tokenReqIndicator) "text 'true' as '1'";
- //variant (tokenReqIndicator) "text 'false' as '0'";
+ //variant (tokenRequestIndicator) "text 'true' as '1'";
+ //variant (tokenRequestIndicator) "text 'false' as '0'";
};
@@ -5270,7 +5298,7 @@ with {
type record Request
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -5321,7 +5349,7 @@ type record ResponsePrimitive
ContentStatus contentStatus optional,
XSD.PositiveInteger contentOffset optional,
DynAuthLocalTokenIdAssignments assignedTokenIdentifiers optional,
- DynAuthTokenReqInfo tokenReqInfo optional
+ DynAuthTokenReqInfo tokenRequestInformation optional
}
with {
variant "name as uncapitalized";
@@ -5420,7 +5448,7 @@ with {
type record Role
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -5458,7 +5486,7 @@ with {
type record Schedule
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -5491,7 +5519,7 @@ with {
type record ScheduleAnnc
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -5511,7 +5539,7 @@ with {
type record SemanticDescriptor
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -5549,7 +5577,7 @@ with {
type record SemanticDescriptorAnnc
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -5584,7 +5612,7 @@ with {
type record ServiceSubscribedAppRule
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -5597,6 +5625,7 @@ type record ServiceSubscribedAppRule
ListOfM2MID applicableCredIDs optional,
ListOfM2MID allowedApp_IDs optional,
ListOfM2MID allowedAEs optional,
+ record length(1 .. infinity) of RoleID allowedRole_IDs,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of Subscription subscription_list
@@ -5607,6 +5636,8 @@ with {
variant "element";
variant (resourceName) "attribute";
variant (allowedApp_IDs) "name as 'allowedApp-IDs'";
+ variant (allowedRole_IDs) "name as 'allowedRole-IDs'";
+ variant (allowedRole_IDs) "list";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -5617,7 +5648,7 @@ with {
type record ServiceSubscribedNode
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -5652,7 +5683,7 @@ with {
type record Software
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -5708,7 +5739,7 @@ with {
type record SoftwareAnnc
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -5762,7 +5793,7 @@ with {
type record StatsCollect
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -5799,7 +5830,7 @@ with {
type record StatsConfig
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -5832,7 +5863,7 @@ with {
type record Subscription
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -5892,7 +5923,7 @@ type record EventNotificationCriteria
XSD.NonNegativeInteger sizeAbove optional,
XSD.PositiveInteger sizeBelow optional,
record length(0 .. 5) of Operation operationMonitor_list,
- record of Attribute attribute_list,
+ AttributeList_1 attribute optional,
record length(0 .. 5) of NotificationEventType notificationEventType_list,
MissingData missingData optional
}
@@ -5900,8 +5931,6 @@ with {
variant "name as uncapitalized";
variant (operationMonitor_list) "untagged";
variant (operationMonitor_list[-]) "name as 'operationMonitor'";
- variant (attribute_list) "untagged";
- variant (attribute_list[-]) "name as 'attribute'";
variant (notificationEventType_list) "untagged";
variant (notificationEventType_list[-]) "name as 'notificationEventType'";
};
@@ -5929,7 +5958,7 @@ with {
type record SvcFwWrapper
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -5967,7 +5996,7 @@ with {
type record SvcFwWrapperAnnc
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -6004,7 +6033,7 @@ with {
type record SvcObjWrapper
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -6043,7 +6072,7 @@ with {
type record SvcObjWrapperAnnc
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -6081,7 +6110,7 @@ with {
type record TimeSeriesInstance
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -6105,7 +6134,7 @@ with {
type record TimeSeriesInstanceAnnc
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -6127,7 +6156,7 @@ with {
type record TimeSeries
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -6181,7 +6210,7 @@ with {
type record TimeSeriesAnnc
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -6231,7 +6260,7 @@ with {
type record Token
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -6276,7 +6305,7 @@ with {
type record TrafficPattern
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -6325,7 +6354,7 @@ with {
type record TrafficPatternAnnc
{
- XSD.NCName resourceName,
+ ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
@@ -7081,4 +7110,3 @@ with {
variant "controlNamespace 'http://www.w3.org/2001/XMLSchema-instance' prefix 'xsi'";
extension "anytype Notification, AggregatedNotification, AggregatedResponse, ServiceSubscribedAppRule_optional, charstring, AnyURI, AttributeList, AE, AccessControlPolicy, AccessControlPolicy_optional, ACP_update_invalid, AE_optional, AE_update_invalid,AEAnnc_optional, Container_optional, CSEBase_optional, Container_update_invalid, ContentInstance_optional, Group_optional, Group_update_invalid, Schedule_optional, Schedule_update_invalid, Subscription_optional, Subscription_update_invalid, PollingChannel_optional, PollingChannel_update_invalid, LocationPolicy_optional, LocationPolicy_update_invalid"
}
-
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index 01f39d52c5ea0d2464ef288bee90e926f20055a7..90fec81a155b535032745b991168db9cffbf78c3 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 169 2016-11-21 09:45:43Z reinaortega $
+ * $Id: OneM2M_Testcases.ttcn 170 2016-11-21 15:53:54Z reinaortega $
* @desc Module containing test cases for oneM2M
*
*/
@@ -22,7 +22,7 @@ module OneM2M_Testcases {
import from OneM2M_Pixits all;
import from OneM2M_Pics all;
import from OneM2M_Functions all;
- import from LibCommon_Time {modulepar all};
+ import from LibCommon_Time all;
import from XSD all;
@@ -1371,7 +1371,7 @@ module OneM2M_Testcases {
// Preamble
for (i := 0; i<v_sizeResourceTypeList; i := i+1){
- if(match(p_requestPrimitiveList[i].resourceType, int23)){
+ if(match(int23, p_requestPrimitiveList[i].resourceType)){
v_ae2Index := f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE_ID_STEM, "MyAe2", v_poaList), -1); // AE2 is registred
p_requestPrimitiveList[i].primitiveContent.any_1[0].Subscription_optional.notificationURI := {f_getResourceAddress(v_ae2Index)};
p_notifyHandler.start(f_subscriptionVerificationHandler(f_getResourceAddress(v_parentIndex)));
@@ -3355,8 +3355,9 @@ module OneM2M_Testcases {
{
accessControlOriginators := {"admin:admin"},
accessControlOperations := int61,
- accessControlContexts_list := omit,
- accessControlAuthenticationFlag := omit
+ accessControlContexts_list := {},
+ accessControlAuthenticationFlag := omit,
+ accessControlObjectDetails_list := {}
}
}
}
@@ -7646,7 +7647,7 @@ module OneM2M_Testcases {
f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
- v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria(int3)); // TODO this field is initialised 2 time with parent adress resource (here and in f_cse_createResource)
+ v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int3}, -)); // TODO this field is initialised 2 time with parent adress resource (here and in f_cse_createResource)
v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
@@ -7713,7 +7714,7 @@ module OneM2M_Testcases {
f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
- v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria(int2));
+ v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int2}, -));
v_subscriptionResourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex );//Subscription
@@ -7817,7 +7818,7 @@ module OneM2M_Testcases {
f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
- v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria(int4));
+ v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int4}, -));
v_subscriptionResourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription (with name attribute omitted)
@@ -8174,7 +8175,7 @@ module OneM2M_Testcases {
// Local variables
var MsgIn v_response;
var Labels v_labels_1:= {"VALUE_1"};
- var Attribute v_attribute := {"labels",{omit,omit,{"VALUE_1"}}};// TODO normaly value isn't expected
+ var AttributeList_1 v_attributeList := {"labels"};
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var template RequestPrimitive v_createRequest := omit;
@@ -8199,7 +8200,7 @@ module OneM2M_Testcases {
f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
- v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria(int1, {v_attribute}));
+ v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int1}, v_attributeList));
v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
@@ -8246,7 +8247,7 @@ module OneM2M_Testcases {
// Local variables
var MsgIn v_response;
var Labels v_labels_1:= {"VALUE_1"};
- var Attribute v_attribute := {"appName",{omit,omit,{"VALUE_1"}}}; // TODO normaly value isn't expected
+ var AttributeList_1 v_attributeList := {"appName"};
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var template RequestPrimitive v_createRequest := omit;
@@ -8269,7 +8270,7 @@ module OneM2M_Testcases {
f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
- v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria(int1, {v_attribute}));
+ v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int1}, v_attributeList));
v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription