diff --git a/OneM2M_Types.ttcn b/OneM2M_Types.ttcn
index bc543962d091a63f431e91527702a4a2f17ce7e7..825b464b48e63cbab6104b1c4db7c12cf38312a8 100644
--- a/OneM2M_Types.ttcn
+++ b/OneM2M_Types.ttcn
@@ -2064,18 +2064,18 @@ type record EventNotificationCriteria
Timestamp expireAfter optional,
XSD.NonNegativeInteger sizeAbove optional,
XSD.PositiveInteger sizeBelow optional,
- record of OperationMonitor operationMonitor_list,
+ record of OperationMonitor operationMonitor_list optional,//TODO It should be optional
AttributeList_1 attribute optional,
- record length(0 .. 6) of NotificationEventType notificationEventType_list,
+ record length(0 .. 5) of NotificationEventType notificationEventType_list optional,//TODO It should be optional
record length(1 .. infinity) of ResourceType childResourceType optional,
MissingData missingData optional,
FilterOperation filterOperation optional
}
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) "untagged";
variant (notificationEventType_list[-]) "name as 'notificationEventType'";
variant (childResourceType) "list";
};
@@ -2101,13 +2101,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,//TODO It should be optional
+ record of Attribute attribute_list,//TODO It should be optional
+ record of Attribute childAttribute_list,//TODO It should be optional
+ record of Attribute parentAttribute_list,//TODO It should be optional
FilterUsage filterUsage optional,
XSD.NonNegativeInteger limit optional,
- record of Sparql semanticsFilter_list,
+ record of Sparql semanticsFilter_list,//TODO It should be optional
FilterOperation filterOperation optional,
ContentFilterSyntax contentFilterSyntax optional,
XSD.String contentFilterQuery optional,
@@ -2363,17 +2363,17 @@ type record AccessControlRule
record length(1 .. infinity) of Ipv6 ipv6Addresses optional
} accessControlIpAddresses optional,
LocationRegion accessControlLocationRegion optional
- } accessControlContexts_list,
+ } accessControlContexts_list optional,//TODO It should be optional
XSD.Boolean accessControlAuthenticationFlag optional,
record of record {
ResourceType resourceType optional,
SpecializationType specializationID optional,
record length(1 .. infinity) of ResourceType childResourceType
- } accessControlObjectDetails_list
+ } accessControlObjectDetails_list optional //TODO It should be optional
}
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'";
@@ -2381,7 +2381,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";
};
@@ -3254,8 +3254,6 @@ type union Sg_flexContainerResource_group
AllJoynMethodCall allJoynMethodCall,
AllJoynProperty allJoynProperty,
AllJoynSvcObject allJoynSvcObject,
- GenericInterworkingOperationInstance genericInterworkingOperationInstance,
- GenericInterworkingService genericInterworkingService,
SvcFwWrapper svcFwWrapper,
SvcObjWrapper svcObjWrapper
}
@@ -3275,8 +3273,6 @@ type union Sg_announcedFlexContainerResource_group
AllJoynMethodCallAnnc allJoynMethodCallAnnc,
AllJoynPropertyAnnc allJoynPropertyAnnc,
AllJoynSvcObjectAnnc allJoynSvcObjectAnnc,
- GenericInterworkingOperationInstanceAnnc genericInterworkingOperationInstanceAnnc,
- GenericInterworkingServiceAnnc genericInterworkingServiceAnnc,
SvcFwWrapperAnnc svcFwWrapperAnnc,
SvcObjWrapperAnnc svcObjWrapperAnnc
}
@@ -3970,6 +3966,7 @@ type enumerated ResourceType
int10002(10002),
int10003(10003),
int10004(10004),
+ int10005(10005),
int10009(10009),
int10010(10010),
int10013(10013),
@@ -4131,6 +4128,7 @@ type enumerated ResponseStatusCode
int4126(4126),
int4127(4127),
int4128(4128),
+ int4143(4143),
int5000(5000),
int5001(5001),
int5103(5103),
@@ -4385,7 +4383,8 @@ type enumerated NotificationContentType
int1(1),
int2(2),
int3(3),
- int4(4)
+ int4(4),
+ int5(5)
}
with {
variant "useNumber";
@@ -4401,7 +4400,8 @@ type enumerated NotificationEventType
int4(4),
int5(5),
int6(6),
- int7(7)
+ int7(7),
+ int8(8)
}
with {
variant "useNumber";
@@ -5308,186 +5308,6 @@ with {
};
-type record GenericInterworkingOperationInstance
-{
- ResourceName resourceName,
- ResourceType resourceType,
- XSD.ID resourceID,
- NhURI parentID,
- Timestamp creationTime optional,
- Timestamp lastModifiedTime optional,
- Labels labels optional,
- AcpType accessControlPolicyIDs optional,
- Timestamp expirationTime optional,
- ListOfURIs dynamicAuthorizationConsultationIDs optional,
- ListOfURIs announceTo optional,
- ListOfNCNames announcedAttribute optional,
- XSD.NonNegativeInteger stateTag,
- XSD.ID creator optional,
- XSD.AnyURI containerDefinition,
- XSD.AnyURI ontologyRef optional,
- XSD.NonNegativeInteger contentSize,
- XSD.AnyURI nodeLink optional,
- XSD.String operationName,
- XSD.String operationState,
- ListOfDataLinks inputDataPointLinks optional,
- ListOfDataLinks outputDataPointLinks optional,
- ListOfDataLinks inputLinks optional,
- ListOfDataLinks outputLinks optional,
- union {
- record length(1 .. infinity) of ChildResourceRef childResource_list,
- record length(1 .. infinity) of union {
- SemanticDescriptor semanticDescriptor,
- Subscription subscription
- } choice_list
- } choice optional
-}
-with {
- variant "name as uncapitalized";
- variant "element";
- variant (resourceName) "attribute";
- variant (choice) "untagged";
- variant (choice.childResource_list) "untagged";
- variant (choice.childResource_list[-]) "name as 'childResource'";
- variant (choice.choice_list) "untagged";
- variant (choice.choice_list[-]) "untagged";
-};
-
-
-type record GenericInterworkingOperationInstanceAnnc
-{
- ResourceName resourceName,
- ResourceType resourceType,
- XSD.ID resourceID,
- NhURI parentID,
- Timestamp creationTime optional,
- Timestamp lastModifiedTime optional,
- Labels labels optional,
- AcpType accessControlPolicyIDs,
- Timestamp expirationTime optional,
- XSD.AnyURI link,
- ListOfURIs dynamicAuthorizationConsultationIDs optional,
- XSD.NonNegativeInteger stateTag optional,
- XSD.AnyURI containerDefinition,
- XSD.AnyURI ontologyRef optional,
- XSD.NonNegativeInteger contentSize optional,
- XSD.AnyURI nodeLink optional,
- XSD.String operationName optional,
- XSD.String operationState optional,
- ListOfDataLinks inputDataPointLinks optional,
- ListOfDataLinks outputDataPointLinks optional,
- ListOfDataLinks inputLinks optional,
- ListOfDataLinks outputLinks optional,
- union {
- record length(1 .. infinity) of ChildResourceRef childResource_list,
- record length(1 .. infinity) of union {
- SemanticDescriptor semanticDescriptor,
- SemanticDescriptorAnnc semanticDescriptorAnnc,
- Subscription subscription
- } choice_list
- } choice optional
-}
-with {
- variant "name as uncapitalized";
- variant "element";
- variant (resourceName) "attribute";
- variant (choice) "untagged";
- variant (choice.childResource_list) "untagged";
- variant (choice.childResource_list[-]) "name as 'childResource'";
- variant (choice.choice_list) "untagged";
- variant (choice.choice_list[-]) "untagged";
-};
-
-
-type record GenericInterworkingService
-{
- ResourceName resourceName,
- ResourceType resourceType,
- XSD.ID resourceID,
- NhURI parentID,
- Timestamp creationTime optional,
- Timestamp lastModifiedTime optional,
- Labels labels optional,
- AcpType accessControlPolicyIDs optional,
- Timestamp expirationTime optional,
- ListOfURIs dynamicAuthorizationConsultationIDs optional,
- ListOfURIs announceTo optional,
- ListOfNCNames announcedAttribute optional,
- XSD.NonNegativeInteger stateTag,
- XSD.ID creator optional,
- XSD.AnyURI containerDefinition,
- XSD.AnyURI ontologyRef optional,
- XSD.NonNegativeInteger contentSize,
- XSD.AnyURI nodeLink optional,
- XSD.String serviceName,
- ListOfDataLinks inputDataPointLinks optional,
- ListOfDataLinks outputDataPointLinks optional,
- union {
- record length(1 .. infinity) of ChildResourceRef childResource_list,
- record of union {
- GenericInterworkingService genericInterworkingService,
- GenericInterworkingOperationInstance genericInterworkingOperationInstance,
- SemanticDescriptor semanticDescriptor,
- Subscription subscription
- } choice_list
- } choice optional
-}
-with {
- variant "name as uncapitalized";
- variant "element";
- variant (resourceName) "attribute";
- variant (choice) "untagged";
- variant (choice.childResource_list) "untagged";
- variant (choice.childResource_list[-]) "name as 'childResource'";
- variant (choice.choice_list) "untagged";
- variant (choice.choice_list[-]) "untagged";
-};
-
-
-type record GenericInterworkingServiceAnnc
-{
- ResourceName resourceName,
- ResourceType resourceType,
- XSD.ID resourceID,
- NhURI parentID,
- Timestamp creationTime optional,
- Timestamp lastModifiedTime optional,
- Labels labels optional,
- AcpType accessControlPolicyIDs,
- Timestamp expirationTime optional,
- XSD.AnyURI link,
- ListOfURIs dynamicAuthorizationConsultationIDs optional,
- XSD.NonNegativeInteger stateTag optional,
- XSD.AnyURI containerDefinition,
- XSD.AnyURI ontologyRef optional,
- XSD.NonNegativeInteger contentSize optional,
- XSD.AnyURI nodeLink optional,
- XSD.String serviceName,
- ListOfDataLinks inputDataPointLinks optional,
- ListOfDataLinks outputDataPointLinks optional,
- union {
- record length(1 .. infinity) of ChildResourceRef childResource_list,
- record of union {
- GenericInterworkingServiceAnnc genericInterworkingServiceAnnc,
- GenericInterworkingOperationInstanceAnnc genericInterworkingOperationInstanceAnnc,
- SemanticDescriptor semanticDescriptor,
- SemanticDescriptorAnnc semanticDescriptorAnnc,
- Subscription subscription
- } choice_list
- } choice optional
-}
-with {
- variant "name as uncapitalized";
- variant "element";
- variant (resourceName) "attribute";
- variant (choice) "untagged";
- variant (choice.childResource_list) "untagged";
- variant (choice.childResource_list[-]) "name as 'childResource'";
- variant (choice.choice_list) "untagged";
- variant (choice.choice_list[-]) "untagged";
-};
-
-
type record Group
{
ResourceName resourceName,
@@ -5507,7 +5327,7 @@ type record Group
SpecializationType specializationType optional,
XSD.NonNegativeInteger currentNrOfMembers,
XSD.PositiveInteger maxNrOfMembers,
- record length(0 .. infinity) of XSD.AnyURI memberIDs,//TODO A list that can be empty as defined in TS-0004,
+ record of XSD.AnyURI memberIDs,
ListOfURIs membersAccessControlPolicyIDs optional,
XSD.Boolean memberTypeValidated optional,
ConsistencyStrategy consistencyStrategy optional,
@@ -6177,7 +5997,7 @@ type record Notification_1
Operation operation optional,
XSD.ID originator optional
} operationMonitor optional,
- NotificationEventType notificationEventType optional
+ NotificationEventType notificationEventType
} notificationEvent optional,
XSD.Boolean verificationRequest optional,
XSD.Boolean subscriptionDeletion optional,
@@ -6276,15 +6096,14 @@ with {
//FIXME To replace Representation type by this
type union Representation {
Resource_2 resource,
- URI uRI
+ URI uRI,
+ TimeSeriesNotification timeSeriesNotification
}
with {
variant "name as 'representation'";
variant (uRI) "name as capitalized";
};
-
-
-
+
type record OntologyRepository
{
ResourceName resourceName,
@@ -6880,7 +6699,7 @@ with {
};
-type record length(0 .. infinity) of XSD.AnyURI URIList //TODO Allow URIList to be empty as defined in TS-0004
+type record of XSD.AnyURI URIList
with {
variant "list";
variant "element";
@@ -6960,7 +6779,7 @@ with {
type record ListOfChildResourceRef
{
- record length(1 .. infinity) of ChildResourceRef resourceRef_list
+ record of ChildResourceRef resourceRef_list
}
with {
variant "name as uncapitalized";
@@ -7995,6 +7814,17 @@ with {
};
+type record TimeSeriesNotification
+{
+ MissingDataList missingDataList,
+ XSD.NonNegativeInteger missingDataCurrentNr
+}
+with {
+ variant "name as uncapitalized";
+ variant "element";
+};
+
+
type record TimeSeries
{
ResourceName resourceName,
@@ -8288,9 +8118,9 @@ with {
};
}
- with {
- encode "XML";
- //variant "namespace as 'http://www.onem2m.org/xml/protocols' prefix 'm2m'";
- //variant "controlNamespace 'http://www.w3.org/2001/XMLSchema-instance' prefix 'xsi'";
- extension "anytype Resource, URI, Notification, AggregatedNotification, AggregatedResponse, ServiceSubscribedAppRule_optional, charstring, AnyURI, AttributeList, AE, AccessControlPolicy, AccessControlPolicy_optional, AccessControlPolicyAnnc_optional, ACP_update_invalid, AE_optional, AE_update_invalid,AEAnnc_optional, Container_optional, ContainerAnnc_optional, ContentInstanceAnnc_optional, CSEBase_optional, Container_update_invalid, ContentInstance_optional, Group_optional, Group_update_invalid, GroupAnnc_optional, LocationPolicyAnnc_optional, MgmtResource_optional, AnnouncedMgmtResource_optional, Node_optional, NodeAnnc_optional, Schedule_optional, ScheduleAnnc_optional, Schedule_update_invalid, Subscription_optional, Subscription_update_invalid, PollingChannel_optional, PollingChannel_update_invalid, LocationPolicy_optional, LocationPolicy_update_invalid, SemanticDescriptor_optional, FlexContainerResource_optional, GenericInterworkingOperationInstance_optional"
+with {
+ encode "XML";
+ //variant "namespace as 'http://www.onem2m.org/xml/protocols' prefix 'm2m'";
+ //variant "controlNamespace 'http://www.w3.org/2001/XMLSchema-instance' prefix 'xsi'";
+ extension "anytype Resource, URI, Notification, AggregatedNotification, AggregatedResponse, ServiceSubscribedAppRule_optional, charstring, AnyURI, AttributeList, AE, AccessControlPolicy, AccessControlPolicy_optional, AccessControlPolicyAnnc_optional, ACP_invalid, AE_optional, AE_invalid,AEAnnc_optional, Container_optional, ContainerAnnc_optional, ContentInstanceAnnc_optional, CSEBase_optional, Container_invalid, ContentInstance_optional, Group_optional, Group_invalid, GroupAnnc_optional, LocationPolicyAnnc_optional, MgmtResource_optional, AnnouncedMgmtResource_optional, Node_optional, NodeAnnc_optional, Schedule_optional, ScheduleAnnc_optional, Schedule_invalid, Subscription_optional, Subscription_invalid, PollingChannel_optional, PollingChannel_invalid, LocationPolicy_optional, LocationPolicy_invalid, SemanticDescriptor_optional, FlexContainerResource_optional, GenericInterworkingOperationInstance_optional"
}