OneM2M_Types.ttcn

@@ -2346,7 +2346,7 @@ type record EventNotificationCriteria
 }
 with {
   variant "name as uncapitalized";
-//  variant (operationMonitor_list) "untagged";
+  variant (operationMonitor_list) "untagged";
   variant (operationMonitor_list[-]) "name as 'operationMonitor'";
 //  variant (notificationEventType_list) "untagged";
   variant (notificationEventType_list[-]) "name as 'notificationEventType'";
@@ -2374,13 +2374,13 @@ type record FilterCriteria
 	record length(1 .. infinity) of ResourceType parentResourceType optional,
 	XSD.NonNegativeInteger sizeAbove optional,
 	XSD.PositiveInteger sizeBelow optional,
-	record of TypeOfContent contentType_list,
-	record of Attribute attribute_list,
-	record of Attribute childAttribute_list,
-	record of Attribute parentAttribute_list,
+	record of TypeOfContent contentType_list optional,//TODO Make it optional
+	record of Attribute attribute_list optional,//TODO Make it optional
+	record of Attribute childAttribute_list optional,//TODO Make it optional
+	record of Attribute parentAttribute_list optional,//TODO Make it optional
 	FilterUsage filterUsage optional,
 	XSD.NonNegativeInteger limit optional,
-	record of Sparql semanticsFilter_list,
+	record of Sparql semanticsFilter_list optional,//TODO Make it optional
 	FilterOperation filterOperation optional,
 	ContentFilterSyntax contentFilterSyntax optional,
 	XSD.String contentFilterQuery optional,
@@ -2652,7 +2652,7 @@ type record AccessControlRule
 }
 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'";
@@ -2660,7 +2660,7 @@ 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) "untagged";
   variant (accessControlObjectDetails_list[-]) "name as 'accessControlObjectDetails'";
   variant (accessControlObjectDetails_list[-].childResourceType) "list";
 };
@@ -5736,7 +5736,10 @@ type enumerated TriggerStatus
 	int3(3),
 	int4(4),
 	int5(5),
-	int6(6)
+	int6(6),
+	int7(7),
+	int8(8),
+	int9(9)
 }
 with {
   variant "useNumber";
@@ -9722,7 +9725,7 @@ type record Subscription
 	EventCat notificationEventCat optional,
 	XSD.AnyURI subscriberURI optional,
 	ListOfURIs associatedCrossResourceSub optional,
-	XSD.Boolean notificationStatsEnable,
+	XSD.Boolean notificationStatsEnable optional,
 	SetOfNotificationStatsInfo notificationStatsInfo optional,
 	XSD.AnyURI primitiveProfileID optional,
 	union {
@@ -10032,8 +10035,14 @@ with {
   variant (choice.choice_list[-]) "untagged";
 };
 
+type TimeSeriesNotificationType TimeSeriesNotification
+with {
+  variant "name as uncapitalized";
+  variant "element";
+};
+
 
-type record TimeSeriesNotification
+type record TimeSeriesNotificationType
 {
 	MissingDataList missingDataList,
 	XSD.NonNegativeInteger missingDataCurrentNr
@@ -10377,7 +10386,14 @@ with {
 };
 
 
-type record TriggerPayload
+
+type TriggerPayloadType TriggerPayload
+with {
+  variant "name as uncapitalized";
+  variant "element";
+};
+
+type record TriggerPayloadType
 {
 	TriggerPurpose triggerPurpose,
 	XSD.AnyURI triggerInfoAddress optional,