Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • Interim
  • Interim-TDE-2021-0061
  • ProcessManagementAndSoftwareManagementTypes
  • Titan-changes
  • main
  • master
6 results

Target

Select target project
  • TST/ATS-oneM2M-Types-Release-4
1 result
Select Git revision
  • Interim
  • Interim-TDE-2021-0061
  • ProcessManagementAndSoftwareManagementTypes
  • Titan-changes
  • main
  • master
6 results
Show changes
Commits on Source (5)
Show whitespace changes
Inline Side-by-side
Showing
with 80 additions and 23 deletions
OneM2M_Types.ttcn
View file @ 3295ee7d
...@@ -15,7 +15,7 @@ module OneM2M_Types { ...@@ -15,7 +15,7 @@ module OneM2M_Types {
import from XSD all; import from XSD all;
import from OneM2M_TypesAndValues {type Resource_2; type ResourceTypeList_1; type PrimitiveContent; type RecordOfDynAuthJWT; template c_multipolygon;template c_polygon;template c_multiLineString;template c_lineStringOrMultipoint;template c_multipoint;const c_point;};//TODO Manually added until XSD files are updated import from OneM2M_TypesAndValues {type Resource_2; type ResourceTypeList_1; type PrimitiveContent; type RecordOfDynAuthJWT; template c_multipolygon;template c_polygon;template c_multiLineString;template c_lineStringOrMultipoint;template c_multipoint;template c_point;};//TODO Manually added until XSD files are updated
import from OneM2M_Types_homeDevice {type Battery; type BatteryAnnc}; import from OneM2M_Types_homeDevice {type Battery; type BatteryAnnc};
...@@ -69,6 +69,7 @@ type record AccessControlPolicyAnnc ...@@ -69,6 +69,7 @@ type record AccessControlPolicyAnnc
Labels labels optional, Labels labels optional,
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
AnnounceSyncType announceSyncType optional,
SetOfAcrs privileges, SetOfAcrs privileges,
SetOfAcrs selfPrivileges, SetOfAcrs selfPrivileges,
ListOfURIs authorizationDecisionResourceIDs, ListOfURIs authorizationDecisionResourceIDs,
...@@ -129,7 +130,7 @@ type record Action ...@@ -129,7 +130,7 @@ type record Action
union { union {
record length(1 .. infinity) of ChildResourceRef childResource_list, record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union { record length(1 .. infinity) of union {
DependencyAnnc dependencyAnnc, Dependency dependency,
Subscription subscription, Subscription subscription,
Transaction transaction Transaction transaction
} choice_list } choice_list
...@@ -161,6 +162,7 @@ type record ActionAnnc ...@@ -161,6 +162,7 @@ type record ActionAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
XSD.PositiveInteger actionPriority optional, XSD.PositiveInteger actionPriority optional,
XSD.AnyURI subjectResourceID optional, XSD.AnyURI subjectResourceID optional,
EvalCriteria evalCriteria optional, EvalCriteria evalCriteria optional,
...@@ -174,7 +176,7 @@ type record ActionAnnc ...@@ -174,7 +176,7 @@ type record ActionAnnc
union { union {
record length(1 .. infinity) of ChildResourceRef childResource_list, record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union { record length(1 .. infinity) of union {
Dependency dependency, DependencyAnnc dependencyAnnc,
Subscription subscription, Subscription subscription,
Transaction transaction Transaction transaction
} choice_list } choice_list
...@@ -316,7 +318,7 @@ type record AE ...@@ -316,7 +318,7 @@ type record AE
XSD.Boolean triggerEnable optional, XSD.Boolean triggerEnable optional,
ActivityPatternElements activityPatternElements optional, ActivityPatternElements activityPatternElements optional,
XSD.Boolean enableTimeCompensation optional, XSD.Boolean enableTimeCompensation optional,
TriggerRecipientID Trigger_Recipient_ID optional, TriggerRecipientID trigger_Recipient_ID optional,
XSD.UnsignedInt triggerReferenceNumber optional, XSD.UnsignedInt triggerReferenceNumber optional,
ExternalID externalGroupID optional, ExternalID externalGroupID optional,
union { union {
...@@ -359,12 +361,14 @@ with { ...@@ -359,12 +361,14 @@ with {
//variant (triggerEnable) "text 'false' as '0'"; //variant (triggerEnable) "text 'false' as '0'";
//variant (enableTimeCompensation) "text 'true' as '1'"; //variant (enableTimeCompensation) "text 'true' as '1'";
//variant (enableTimeCompensation) "text 'false' as '0'"; //variant (enableTimeCompensation) "text 'false' as '0'";
variant (trigger_Recipient_ID) "name as 'Trigger-Recipient-ID'";
variant (choice) "untagged"; variant (choice) "untagged";
variant (choice.childResource_list) "untagged"; variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'"; variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged"; variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged"; variant (choice.choice_list[-]) "untagged";
variant (choice.choice_list[-].group_) "name as 'group'"; variant (choice.choice_list[-].group_) "name as 'group'";
variant (choice.choice_list[-].action_) "name as 'action'";
}; };
...@@ -381,6 +385,7 @@ type record AEAnnc ...@@ -381,6 +385,7 @@ type record AEAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
GeoCoordinates location optional, GeoCoordinates location optional,
XSD.String appName optional, XSD.String appName optional,
XSD.String app_ID optional, XSD.String app_ID optional,
...@@ -1106,6 +1111,7 @@ type record AreaNwkDeviceInfoAnnc ...@@ -1106,6 +1111,7 @@ type record AreaNwkDeviceInfoAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition, MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional, ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional, ListOfURIs objectPaths optional,
...@@ -1189,6 +1195,7 @@ type record AreaNwkInfoAnnc ...@@ -1189,6 +1195,7 @@ type record AreaNwkInfoAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition, MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional, ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional, ListOfURIs objectPaths optional,
...@@ -1439,6 +1446,7 @@ type record BatteryMgmtAnnc//TODO According to XSDs, it should be BatteryAnnc, b ...@@ -1439,6 +1446,7 @@ type record BatteryMgmtAnnc//TODO According to XSDs, it should be BatteryAnnc, b
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition, MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional, ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional, ListOfURIs objectPaths optional,
...@@ -2151,13 +2159,13 @@ with { ...@@ -2151,13 +2159,13 @@ with {
}; };
type XSD.String ReleaseVersion (pattern "(2|2a|3|4)") //TODO - Check that it is defines as all available releases backwards till 2a. XSD will define it as this type XSD.String ReleaseVersion (pattern "(2|2a|3|4)") //FIXME - As defined in XSD
with { with {
variant "name as uncapitalized"; variant "name as uncapitalized";
}; };
type XSD.String ApplicableReleaseVersion (pattern "(1|2|2a|3|4)") //TODO - Check that it is defined as all available release backwards. XSD will define it as this type XSD.String ApplicableReleaseVersion (pattern "(1|2|2a|3|4)") //FIXME - As defined in XSD
with { with {
variant "name as uncapitalized"; variant "name as uncapitalized";
}; };
...@@ -2186,7 +2194,7 @@ with { ...@@ -2186,7 +2194,7 @@ with {
}; };
type XSD.String ListOfCoordinates (pattern "{c_multipolygon}|{c_polygon}|{c_multiLineString}|{c_lineStringOrMultipoint}|{c_multipoint}|{c_point}") type XSD.String GeoJsonCoordinates (pattern "{c_multipolygon}|{c_polygon}|{c_multiLineString}|{c_lineStringOrMultipoint}|{c_multipoint}|{c_point}")
with { with {
variant "name as uncapitalized"; variant "name as uncapitalized";
}; };
...@@ -3124,7 +3132,7 @@ with { ...@@ -3124,7 +3132,7 @@ with {
type record GeoCoordinates type record GeoCoordinates
{ {
GeometryType type_, GeometryType type_,
ListOfCoordinates coordinates GeoJsonCoordinates coordinates
} }
with { with {
variant "name as uncapitalized"; variant "name as uncapitalized";
...@@ -3135,7 +3143,7 @@ with { ...@@ -3135,7 +3143,7 @@ with {
type record GeoQuery type record GeoQuery
{ {
GeometryType geometryType, GeometryType geometryType,
ListOfCoordinates geometry, GeoJsonCoordinates geometry,
GeoSpatialFunctionType geoSpatialFunction GeoSpatialFunctionType geoSpatialFunction
} }
with { with {
...@@ -3369,7 +3377,8 @@ type record AnnouncedResource ...@@ -3369,7 +3377,8 @@ type record AnnouncedResource
AcpType accessControlPolicyIDs, AcpType accessControlPolicyIDs,
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional
} }
with { with {
variant "name as uncapitalized"; variant "name as uncapitalized";
...@@ -3425,7 +3434,8 @@ type record AnnouncedSubordinateResource ...@@ -3425,7 +3434,8 @@ type record AnnouncedSubordinateResource
Timestamp lastModifiedTime, Timestamp lastModifiedTime,
Labels labels optional, Labels labels optional,
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link XSD.AnyURI link,
AnnounceSyncType announceSyncType optional
} }
with { with {
variant "name as uncapitalized"; variant "name as uncapitalized";
...@@ -3475,6 +3485,7 @@ type record AnnouncedMgmtResource ...@@ -3475,6 +3485,7 @@ type record AnnouncedMgmtResource
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition, MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional, ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional, ListOfURIs objectPaths optional,
...@@ -3513,8 +3524,8 @@ type record FlexContainerResource ...@@ -3513,8 +3524,8 @@ type record FlexContainerResource
AnnounceSyncType announceSyncType optional, AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag, XSD.NonNegativeInteger stateTag,
XSD.ID creator optional, XSD.ID creator optional,
XSD.ID custodian optional,
GeoCoordinates location optional, GeoCoordinates location optional,
XSD.ID custodian optional,
XSD.AnyURI containerDefinition, XSD.AnyURI containerDefinition,
XSD.AnyURI ontologyRef optional, XSD.AnyURI ontologyRef optional,
XSD.NonNegativeInteger contentSize, XSD.NonNegativeInteger contentSize,
...@@ -3573,7 +3584,8 @@ type record FlexContainerInstanceResource ...@@ -3573,7 +3584,8 @@ type record FlexContainerInstanceResource
Timestamp expirationTime, Timestamp expirationTime,
Labels labels optional, Labels labels optional,
XSD.NonNegativeInteger contentSize, XSD.NonNegativeInteger contentSize,
XSD.ID originator XSD.ID originator,
GeoCoordinates location optional
} }
with { with {
variant "name as uncapitalized"; variant "name as uncapitalized";
...@@ -3914,6 +3926,7 @@ with { ...@@ -3914,6 +3926,7 @@ with {
variant (choice.childResource_list[-]) "name as 'childResource'"; variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged"; variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged"; variant (choice.choice_list[-]) "untagged";
variant (choice.choice_list[-].action_) "name as 'action'";
}; };
...@@ -3930,6 +3943,7 @@ type record ContainerAnnc ...@@ -3930,6 +3943,7 @@ type record ContainerAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag, XSD.NonNegativeInteger stateTag,
GeoCoordinates location optional, GeoCoordinates location optional,
XSD.NonNegativeInteger maxNrOfInstances optional, XSD.NonNegativeInteger maxNrOfInstances optional,
...@@ -3988,6 +4002,7 @@ type record ContentInstance ...@@ -3988,6 +4002,7 @@ type record ContentInstance
AnnounceSyncType announceSyncType optional, AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag, XSD.NonNegativeInteger stateTag,
XSD.ID creator optional, XSD.ID creator optional,
GeoCoordinates location optional,
ContentInfo contentInfo optional, ContentInfo contentInfo optional,
XSD.NonNegativeInteger contentSize, XSD.NonNegativeInteger contentSize,
ContentRef contentRef optional, ContentRef contentRef optional,
...@@ -4026,7 +4041,9 @@ type record ContentInstanceAnnc ...@@ -4026,7 +4041,9 @@ type record ContentInstanceAnnc
Labels labels optional, Labels labels optional,
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag, XSD.NonNegativeInteger stateTag,
GeoCoordinates location optional,
ContentInfo contentInfo optional, ContentInfo contentInfo optional,
XSD.NonNegativeInteger contentSize optional, XSD.NonNegativeInteger contentSize optional,
XSD.AnyURI ontologyRef optional, XSD.AnyURI ontologyRef optional,
...@@ -4177,9 +4194,11 @@ with { ...@@ -4177,9 +4194,11 @@ with {
variant (choice.childResource_list[-]) "name as 'childResource'"; variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged"; variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged"; variant (choice.choice_list[-]) "untagged";
variant (choice.choice_list[-].cSEBaseAnnc) "name as capitalized";
variant (choice.choice_list[-].aE) "name as capitalized"; variant (choice.choice_list[-].aE) "name as capitalized";
variant (choice.choice_list[-].group_) "name as 'group'"; variant (choice.choice_list[-].group_) "name as 'group'";
variant (choice.choice_list[-].aEContactList) "name as capitalized"; variant (choice.choice_list[-].aEContactList) "name as capitalized";
variant (choice.choice_list[-].action_) "name as 'action'";
}; };
...@@ -4196,6 +4215,7 @@ type record CSEBaseAnnc ...@@ -4196,6 +4215,7 @@ type record CSEBaseAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
E2eSecInfo e2eSecInfo optional, E2eSecInfo e2eSecInfo optional,
SupportedReleaseVersions supportedReleaseVersions, SupportedReleaseVersions supportedReleaseVersions,
union { union {
...@@ -4323,6 +4343,7 @@ type record DependencyAnnc ...@@ -4323,6 +4343,7 @@ type record DependencyAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
XSD.Boolean sufficient optional, XSD.Boolean sufficient optional,
EvalCriteria evalCriteria optional, EvalCriteria evalCriteria optional,
XSD.AnyURI referencedResourceID, XSD.AnyURI referencedResourceID,
...@@ -4414,6 +4435,7 @@ type record DeviceCapabilityAnnc ...@@ -4414,6 +4435,7 @@ type record DeviceCapabilityAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition, MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional, ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional, ListOfURIs objectPaths optional,
...@@ -4520,6 +4542,7 @@ type record DeviceInfoAnnc ...@@ -4520,6 +4542,7 @@ type record DeviceInfoAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition, MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional, ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional, ListOfURIs objectPaths optional,
...@@ -6269,6 +6292,7 @@ type record EventLogAnnc ...@@ -6269,6 +6292,7 @@ type record EventLogAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition, MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional, ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional, ListOfURIs objectPaths optional,
...@@ -6404,6 +6428,7 @@ type record FirmwareAnnc ...@@ -6404,6 +6428,7 @@ type record FirmwareAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition, MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional, ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional, ListOfURIs objectPaths optional,
...@@ -6491,6 +6516,7 @@ with { ...@@ -6491,6 +6516,7 @@ with {
variant (choice.childResource_list[-]) "name as 'childResource'"; variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged"; variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged"; variant (choice.choice_list[-]) "untagged";
variant (choice.choice_list[-].action_) "name as 'action'";
}; };
...@@ -6507,6 +6533,7 @@ type record GroupAnnc ...@@ -6507,6 +6533,7 @@ type record GroupAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
MemberType memberType optional, MemberType memberType optional,
SpecializationType specializationType optional, SpecializationType specializationType optional,
XSD.NonNegativeInteger currentNrOfMembers optional, XSD.NonNegativeInteger currentNrOfMembers optional,
...@@ -6659,6 +6686,7 @@ type record LocationPolicyAnnc ...@@ -6659,6 +6686,7 @@ type record LocationPolicyAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
LocationSource locationSource optional, LocationSource locationSource optional,
LocationInformationType locationInformationType optional, LocationInformationType locationInformationType optional,
ListOfDuration locationUpdatePeriod optional, ListOfDuration locationUpdatePeriod optional,
...@@ -6707,7 +6735,7 @@ type record M2mServiceSubscriptionProfile ...@@ -6707,7 +6735,7 @@ type record M2mServiceSubscriptionProfile
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.ID custodian optional, XSD.ID custodian optional,
XSD.ID m2M_Sub_ID, XSD.ID m2M_Sub_ID,
XSD.ID m2M_SS_ID optional, XSD.ID m2M_SS_ID,
ServiceSubscriptionStatus status, ServiceSubscriptionStatus status,
XSD.Boolean activate_, XSD.Boolean activate_,
Timestamp activationTime optional, Timestamp activationTime optional,
...@@ -6810,6 +6838,7 @@ type record MemoryAnnc ...@@ -6810,6 +6838,7 @@ type record MemoryAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition, MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional, ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional, ListOfURIs objectPaths optional,
...@@ -6863,7 +6892,7 @@ type record MgmtCmd ...@@ -6863,7 +6892,7 @@ type record MgmtCmd
Subscription subscription, Subscription subscription,
Transaction transaction Transaction transaction
} choice_list } choice_list
} choice } choice optional
} }
with { with {
variant "name as uncapitalized"; variant "name as uncapitalized";
...@@ -6933,6 +6962,7 @@ type record MultimediaSessionAnnc ...@@ -6933,6 +6962,7 @@ type record MultimediaSessionAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
XSD.ID sessionOriginatorID, XSD.ID sessionOriginatorID,
SessionDescriptions acceptedSessionDescriptions, SessionDescriptions acceptedSessionDescriptions,
SessionState sessionState, SessionState sessionState,
...@@ -7015,6 +7045,7 @@ with { ...@@ -7015,6 +7045,7 @@ with {
variant (choice.childResource_list[-]) "name as 'childResource'"; variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged"; variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged"; variant (choice.choice_list[-]) "untagged";
variant (choice.choice_list[-].action_) "name as 'action'";
}; };
...@@ -7031,6 +7062,7 @@ type record NodeAnnc ...@@ -7031,6 +7062,7 @@ type record NodeAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
NodeID nodeID, NodeID nodeID,
XSD.ID hostedCSELink optional, XSD.ID hostedCSELink optional,
ListOfM2MID hostedAELinks optional, ListOfM2MID hostedAELinks optional,
...@@ -7184,7 +7216,7 @@ type record Notification_1 ...@@ -7184,7 +7216,7 @@ type record Notification_1
} notificationEvent optional, } notificationEvent optional,
XSD.Boolean verificationRequest optional, XSD.Boolean verificationRequest optional,
XSD.Boolean subscriptionDeletion optional, XSD.Boolean subscriptionDeletion optional,
XSD.AnyURI subscriptionReference optional, XSD.AnyURI subscriptionReference,
XSD.ID creator optional, XSD.ID creator optional,
XSD.AnyURI notificationForwardingURI optional, XSD.AnyURI notificationForwardingURI optional,
XSD.ID notificationTarget optional, XSD.ID notificationTarget optional,
...@@ -7389,6 +7421,7 @@ type record OntologyMappingAlgorithmRepositoryAnnc ...@@ -7389,6 +7421,7 @@ type record OntologyMappingAlgorithmRepositoryAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
union { union {
record length(1 .. infinity) of ChildResourceRef childResource_list, record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union { record length(1 .. infinity) of union {
...@@ -7464,6 +7497,7 @@ type record OntologyMappingAlgorithmAnnc ...@@ -7464,6 +7497,7 @@ type record OntologyMappingAlgorithmAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
union { union {
record length(1 .. infinity) of ChildResourceRef childResource_list, record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union { record length(1 .. infinity) of union {
...@@ -7540,6 +7574,7 @@ type record OntologyMappingAnnc ...@@ -7540,6 +7574,7 @@ type record OntologyMappingAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
union { union {
record length(1 .. infinity) of ChildResourceRef childResource_list, record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union { record length(1 .. infinity) of union {
...@@ -7614,6 +7649,7 @@ type record OntologyRepositoryAnnc ...@@ -7614,6 +7649,7 @@ type record OntologyRepositoryAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag, XSD.NonNegativeInteger stateTag,
union { union {
record length(1 .. infinity) of ChildResourceRef childResource_list, record length(1 .. infinity) of ChildResourceRef childResource_list,
...@@ -7695,6 +7731,7 @@ type record OntologyAnnc ...@@ -7695,6 +7731,7 @@ type record OntologyAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag, XSD.NonNegativeInteger stateTag,
XSD.String description optional, XSD.String description optional,
SemanticFormat ontologyFormat optional, SemanticFormat ontologyFormat optional,
...@@ -7844,6 +7881,7 @@ type record PrimitiveProfileAnnc ...@@ -7844,6 +7881,7 @@ type record PrimitiveProfileAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
ListOfM2MID iDList optional, ListOfM2MID iDList optional,
ResourceTypeList resourceTypes optional, ResourceTypeList resourceTypes optional,
ListOfOperations operations optional, ListOfOperations operations optional,
...@@ -7930,6 +7968,7 @@ type record ProcessManagementAnnc ...@@ -7930,6 +7968,7 @@ type record ProcessManagementAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
ProcessStatus processStatus optional, ProcessStatus processStatus optional,
ProcessControl processControl optional, ProcessControl processControl optional,
XSD.AnyURI currentState optional, XSD.AnyURI currentState optional,
...@@ -8013,6 +8052,7 @@ type record ReasoningJobInstanceAnnc ...@@ -8013,6 +8052,7 @@ type record ReasoningJobInstanceAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
ReasoningType reasoningType optional, ReasoningType reasoningType optional,
ReasoningJobWorkingMode reasoningMode optional, ReasoningJobWorkingMode reasoningMode optional,
XSD.PositiveInteger reasoningPeriod optional, XSD.PositiveInteger reasoningPeriod optional,
...@@ -8091,6 +8131,7 @@ type record ReasoningRulesAnnc ...@@ -8091,6 +8131,7 @@ type record ReasoningRulesAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
XSD.AnyURI ontologyRef optional, XSD.AnyURI ontologyRef optional,
ReasoningRuleFormat ruleRepresentationFormat optional, ReasoningRuleFormat ruleRepresentationFormat optional,
XSD.Base64Binary ruleRepresentation optional, XSD.Base64Binary ruleRepresentation optional,
...@@ -8171,6 +8212,7 @@ type record RebootAnnc ...@@ -8171,6 +8212,7 @@ type record RebootAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition, MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional, ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional, ListOfURIs objectPaths optional,
...@@ -8266,7 +8308,8 @@ type record RemoteCSE ...@@ -8266,7 +8308,8 @@ type record RemoteCSE
NwMonitoringReq nwMonitoringReq, NwMonitoringReq nwMonitoringReq,
PrimitiveProfile primitiveProfile, PrimitiveProfile primitiveProfile,
PrimitiveProfileAnnc primitiveProfileAnnc, PrimitiveProfileAnnc primitiveProfileAnnc,
Action action_ Action action_,
ActionAnnc actionAnnc
} choice_list } choice_list
} choice optional } choice optional
} }
...@@ -8292,6 +8335,7 @@ with { ...@@ -8292,6 +8335,7 @@ with {
variant (choice.choice_list[-]) "untagged"; variant (choice.choice_list[-]) "untagged";
variant (choice.choice_list[-].group_) "name as 'group'"; variant (choice.choice_list[-].group_) "name as 'group'";
variant (choice.choice_list[-].aEAnnc) "name as capitalized"; variant (choice.choice_list[-].aEAnnc) "name as capitalized";
variant (choice.choice_list[-].action_) "name as 'action'";
}; };
...@@ -8308,6 +8352,7 @@ type record RemoteCSEAnnc ...@@ -8308,6 +8352,7 @@ type record RemoteCSEAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
GeoCoordinates location optional, GeoCoordinates location optional,
CseTypeID cseType optional, CseTypeID cseType optional,
PoaList pointOfAccess optional, PoaList pointOfAccess optional,
...@@ -8745,6 +8790,7 @@ type record ScheduleAnnc ...@@ -8745,6 +8790,7 @@ type record ScheduleAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
ScheduleEntries scheduleElement optional, ScheduleEntries scheduleElement optional,
XSD.Boolean networkCoordinated, XSD.Boolean networkCoordinated,
union { union {
...@@ -8830,6 +8876,7 @@ type record SemanticDescriptorAnnc ...@@ -8830,6 +8876,7 @@ type record SemanticDescriptorAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
SemanticFormat descriptorRepresentation optional, SemanticFormat descriptorRepresentation optional,
Sparql semanticOpExec optional, Sparql semanticOpExec optional,
XSD.Base64Binary descriptor optional, XSD.Base64Binary descriptor optional,
...@@ -8921,6 +8968,7 @@ type record SemanticMashupInstanceAnnc ...@@ -8921,6 +8968,7 @@ type record SemanticMashupInstanceAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional, XSD.NonNegativeInteger stateTag optional,
XSD.AnyURI smjpID optional, XSD.AnyURI smjpID optional,
XSD.Base64Binary smjpInputParameter optional, XSD.Base64Binary smjpInputParameter optional,
...@@ -9011,6 +9059,7 @@ type record SemanticMashupJobProfileAnnc ...@@ -9011,6 +9059,7 @@ type record SemanticMashupJobProfileAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional, XSD.NonNegativeInteger stateTag optional,
Sparql memberFilter optional, Sparql memberFilter optional,
ListOfURIs smiID optional, ListOfURIs smiID optional,
...@@ -9170,6 +9219,7 @@ type record SemanticRuleRepositoryAnnc ...@@ -9170,6 +9219,7 @@ type record SemanticRuleRepositoryAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
union { union {
record length(1 .. infinity) of ChildResourceRef childResource_list, record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union { record length(1 .. infinity) of union {
...@@ -9300,7 +9350,7 @@ type record ServiceSubscribedUserProfile ...@@ -9300,7 +9350,7 @@ type record ServiceSubscribedUserProfile
XSD.NonNegativeInteger maxNotificationRate optional, XSD.NonNegativeInteger maxNotificationRate optional,
XSD.NonNegativeInteger maxNumFlexContainers optional, XSD.NonNegativeInteger maxNumFlexContainers optional,
XSD.NonNegativeInteger maxNumInstancesPerFlexContainer optional, XSD.NonNegativeInteger maxNumInstancesPerFlexContainer optional,
SetOfAcrs defaultAccessControlPrivileges optional, AcpType defaultAccessControlPrivileges optional,
union { union {
record length(1 .. infinity) of ChildResourceRef childResource_list, record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union { record length(1 .. infinity) of union {
...@@ -9387,6 +9437,7 @@ type record SoftwareCampaignAnnc ...@@ -9387,6 +9437,7 @@ type record SoftwareCampaignAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
XSD.Boolean campaignEnabled optional, XSD.Boolean campaignEnabled optional,
ExecStatusType campaignStatus optional, ExecStatusType campaignStatus optional,
XSD.String version optional, XSD.String version optional,
...@@ -9494,6 +9545,7 @@ type record SoftwareAnnc ...@@ -9494,6 +9545,7 @@ type record SoftwareAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition, MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional, ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional, ListOfURIs objectPaths optional,
...@@ -9593,6 +9645,7 @@ type record StateAnnc ...@@ -9593,6 +9645,7 @@ type record StateAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
XSD.Boolean stateActive optional, XSD.Boolean stateActive optional,
XSD.AnyURI stateAction optional, XSD.AnyURI stateAction optional,
ListOfStateTransitions stateTransitions optional, ListOfStateTransitions stateTransitions optional,
...@@ -9616,7 +9669,6 @@ with { ...@@ -9616,7 +9669,6 @@ with {
variant (choice.childResource_list[-]) "name as 'childResource'"; variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged"; variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged"; variant (choice.choice_list[-]) "untagged";
variant (choice.choice_list[-].action_) "name as 'action'";
}; };
...@@ -9976,6 +10028,7 @@ type record TimeSeriesInstance ...@@ -9976,6 +10028,7 @@ type record TimeSeriesInstance
ListOfURIs announceTo optional, ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional, record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
AnnounceSyncType announceSyncType optional, AnnounceSyncType announceSyncType optional,
GeoCoordinates location optional,
AbsRelTimestamp dataGenerationTime, AbsRelTimestamp dataGenerationTime,
XSD.AnySimpleType content, XSD.AnySimpleType content,
XSD.NonNegativeInteger sequenceNr optional, XSD.NonNegativeInteger sequenceNr optional,
...@@ -10012,6 +10065,8 @@ type record TimeSeriesInstanceAnnc ...@@ -10012,6 +10065,8 @@ type record TimeSeriesInstanceAnnc
Labels labels optional, Labels labels optional,
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
AnnounceSyncType announceSyncType optional,
GeoCoordinates location optional,
AbsRelTimestamp dataGenerationTime optional, AbsRelTimestamp dataGenerationTime optional,
XSD.AnySimpleType content optional, XSD.AnySimpleType content optional,
XSD.NonNegativeInteger sequenceNr optional, XSD.NonNegativeInteger sequenceNr optional,
...@@ -10049,7 +10104,6 @@ type record TimeSeriesNotificationType ...@@ -10049,7 +10104,6 @@ type record TimeSeriesNotificationType
} }
with { with {
variant "name as uncapitalized"; variant "name as uncapitalized";
variant "element";
}; };
...@@ -10108,6 +10162,7 @@ with { ...@@ -10108,6 +10162,7 @@ with {
variant (choice.childResource_list[-]) "name as 'childResource'"; variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged"; variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged"; variant (choice.choice_list[-]) "untagged";
variant (choice.choice_list[-].action_) "name as 'action'";
}; };
...@@ -10124,6 +10179,7 @@ type record TimeSeriesAnnc ...@@ -10124,6 +10179,7 @@ type record TimeSeriesAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
GeoCoordinates location optional, GeoCoordinates location optional,
XSD.NonNegativeInteger maxNrOfInstances optional, XSD.NonNegativeInteger maxNrOfInstances optional,
XSD.NonNegativeInteger maxByteSize optional, XSD.NonNegativeInteger maxByteSize optional,
...@@ -10218,6 +10274,7 @@ type record TimeSyncBeaconAnnc ...@@ -10218,6 +10274,7 @@ type record TimeSyncBeaconAnnc
Timestamp expirationTime, Timestamp expirationTime,
XSD.AnyURI link, XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs dynamicAuthorizationConsultationIDs optional,
AnnounceSyncType announceSyncType optional,
XSD.ID beaconRequester optional, XSD.ID beaconRequester optional,
BeaconCriteria beaconCriteria optional, BeaconCriteria beaconCriteria optional,
XSD.Duration beaconInterval optional, XSD.Duration beaconInterval optional,
...@@ -10383,6 +10440,7 @@ with { ...@@ -10383,6 +10440,7 @@ with {
variant (choice.childResource_list[-]) "name as 'childResource'"; variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged"; variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged"; variant (choice.choice_list[-]) "untagged";
variant (choice.choice_list[-].action_) "name as 'action'";
}; };
...@@ -10405,7 +10463,6 @@ type record TriggerPayloadType ...@@ -10405,7 +10463,6 @@ type record TriggerPayloadType
} }
with { with {
variant "name as uncapitalized"; variant "name as uncapitalized";
variant "element";
variant (triggerInfoAE_ID) "name as 'triggerInfoAE-ID'"; variant (triggerInfoAE_ID) "name as 'triggerInfoAE-ID'";
}; };
......