From 68fe04ce7e289bf9ea6bb5bc9158958ca00f4368 Mon Sep 17 00:00:00 2001
From: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
Date: Fri, 6 Sep 2024 09:14:00 +0200
Subject: [PATCH] oneM2M types based on XSD v4.16.0 baseline
---
OneM2M_Types.ttcn | 81 ++++++++++++++++++++++++++++++++++++++---------
1 file changed, 66 insertions(+), 15 deletions(-)
diff --git a/OneM2M_Types.ttcn b/OneM2M_Types.ttcn
index 261eefe..bac8b15 100644
--- a/OneM2M_Types.ttcn
+++ b/OneM2M_Types.ttcn
@@ -69,6 +69,7 @@ type record AccessControlPolicyAnnc
Labels labels optional,
Timestamp expirationTime,
XSD.AnyURI link,
+ AnnounceSyncType announceSyncType optional,
SetOfAcrs privileges,
SetOfAcrs selfPrivileges,
ListOfURIs authorizationDecisionResourceIDs,
@@ -129,7 +130,7 @@ type record Action
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
- DependencyAnnc dependencyAnnc,
+ Dependency dependency,
Subscription subscription,
Transaction transaction
} choice_list
@@ -161,6 +162,7 @@ type record ActionAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
XSD.PositiveInteger actionPriority optional,
XSD.AnyURI subjectResourceID optional,
EvalCriteria evalCriteria optional,
@@ -174,7 +176,7 @@ type record ActionAnnc
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
- Dependency dependency,
+ DependencyAnnc dependencyAnnc,
Subscription subscription,
Transaction transaction
} choice_list
@@ -316,7 +318,7 @@ type record AE
XSD.Boolean triggerEnable optional,
ActivityPatternElements activityPatternElements optional,
XSD.Boolean enableTimeCompensation optional,
- TriggerRecipientID Trigger_Recipient_ID optional,
+ TriggerRecipientID trigger_Recipient_ID optional,
XSD.UnsignedInt triggerReferenceNumber optional,
ExternalID externalGroupID optional,
union {
@@ -359,12 +361,14 @@ with {
//variant (triggerEnable) "text 'false' as '0'";
//variant (enableTimeCompensation) "text 'true' as '1'";
//variant (enableTimeCompensation) "text 'false' as '0'";
+ variant (trigger_Recipient_ID) "name as 'Trigger-Recipient-ID'";
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";
variant (choice.choice_list[-].group_) "name as 'group'";
+ variant (choice.choice_list[-].action_) "name as 'action'";
};
@@ -381,6 +385,7 @@ type record AEAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
GeoCoordinates location optional,
XSD.String appName optional,
XSD.String app_ID optional,
@@ -423,7 +428,7 @@ type record AEAnnc
Transaction transaction,
E2eQosSession e2eQosSession,
NwMonitoringReq nwMonitoringReq,
- PrimitiveProfile primitiveProfile,
+ PrimitiveProfile primitiveProfile,
ActionAnnc actionAnnc
} choice_list
} choice optional
@@ -1106,6 +1111,7 @@ type record AreaNwkDeviceInfoAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -1189,6 +1195,7 @@ type record AreaNwkInfoAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -1439,6 +1446,7 @@ type record BatteryMgmtAnnc//TODO According to XSDs, it should be BatteryAnnc, b
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -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 {
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 {
variant "name as uncapitalized";
};
@@ -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 {
variant "name as uncapitalized";
};
@@ -3124,7 +3132,7 @@ with {
type record GeoCoordinates
{
GeometryType type_,
- ListOfCoordinates coordinates
+ GeoJsonCoordinates coordinates
}
with {
variant "name as uncapitalized";
@@ -3135,7 +3143,7 @@ with {
type record GeoQuery
{
GeometryType geometryType,
- ListOfCoordinates geometry,
+ GeoJsonCoordinates geometry,
GeoSpatialFunctionType geoSpatialFunction
}
with {
@@ -3369,7 +3377,8 @@ type record AnnouncedResource
AcpType accessControlPolicyIDs,
Timestamp expirationTime,
XSD.AnyURI link,
- ListOfURIs dynamicAuthorizationConsultationIDs optional
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional
}
with {
variant "name as uncapitalized";
@@ -3425,7 +3434,8 @@ type record AnnouncedSubordinateResource
Timestamp lastModifiedTime,
Labels labels optional,
Timestamp expirationTime,
- XSD.AnyURI link
+ XSD.AnyURI link,
+ AnnounceSyncType announceSyncType optional
}
with {
variant "name as uncapitalized";
@@ -3475,6 +3485,7 @@ type record AnnouncedMgmtResource
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -3914,6 +3925,7 @@ with {
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
+ variant (choice.choice_list[-].action_) "name as 'action'";
};
@@ -3930,6 +3942,7 @@ type record ContainerAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag,
GeoCoordinates location optional,
XSD.NonNegativeInteger maxNrOfInstances optional,
@@ -4026,6 +4039,7 @@ type record ContentInstanceAnnc
Labels labels optional,
Timestamp expirationTime,
XSD.AnyURI link,
+ AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag,
ContentInfo contentInfo optional,
XSD.NonNegativeInteger contentSize optional,
@@ -4177,9 +4191,11 @@ with {
variant (choice.childResource_list[-]) "name as 'childResource'";
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[-].group_) "name as 'group'";
variant (choice.choice_list[-].aEContactList) "name as capitalized";
+ variant (choice.choice_list[-].action_) "name as 'action'";
};
@@ -4196,6 +4212,7 @@ type record CSEBaseAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
E2eSecInfo e2eSecInfo optional,
SupportedReleaseVersions supportedReleaseVersions,
union {
@@ -4323,6 +4340,7 @@ type record DependencyAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
XSD.Boolean sufficient optional,
EvalCriteria evalCriteria optional,
XSD.AnyURI referencedResourceID,
@@ -4414,6 +4432,7 @@ type record DeviceCapabilityAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -4520,6 +4539,7 @@ type record DeviceInfoAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -6269,6 +6289,7 @@ type record EventLogAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -6404,6 +6425,7 @@ type record FirmwareAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -6491,6 +6513,7 @@ with {
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
+ variant (choice.choice_list[-].action_) "name as 'action'";
};
@@ -6507,6 +6530,7 @@ type record GroupAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
MemberType memberType optional,
SpecializationType specializationType optional,
XSD.NonNegativeInteger currentNrOfMembers optional,
@@ -6659,6 +6683,7 @@ type record LocationPolicyAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
LocationSource locationSource optional,
LocationInformationType locationInformationType optional,
ListOfDuration locationUpdatePeriod optional,
@@ -6810,6 +6835,7 @@ type record MemoryAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -6933,6 +6959,7 @@ type record MultimediaSessionAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
XSD.ID sessionOriginatorID,
SessionDescriptions acceptedSessionDescriptions,
SessionState sessionState,
@@ -7015,6 +7042,7 @@ with {
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
+ variant (choice.choice_list[-].action_) "name as 'action'";
};
@@ -7031,6 +7059,7 @@ type record NodeAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
NodeID nodeID,
XSD.ID hostedCSELink optional,
ListOfM2MID hostedAELinks optional,
@@ -7389,6 +7418,7 @@ type record OntologyMappingAlgorithmRepositoryAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
@@ -7464,6 +7494,7 @@ type record OntologyMappingAlgorithmAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
@@ -7540,6 +7571,7 @@ type record OntologyMappingAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
@@ -7614,6 +7646,7 @@ type record OntologyRepositoryAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
@@ -7695,6 +7728,7 @@ type record OntologyAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag,
XSD.String description optional,
SemanticFormat ontologyFormat optional,
@@ -7844,6 +7878,7 @@ type record PrimitiveProfileAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
ListOfM2MID iDList optional,
ResourceTypeList resourceTypes optional,
ListOfOperations operations optional,
@@ -7930,6 +7965,7 @@ type record ProcessManagementAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
ProcessStatus processStatus optional,
ProcessControl processControl optional,
XSD.AnyURI currentState optional,
@@ -8013,6 +8049,7 @@ type record ReasoningJobInstanceAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
ReasoningType reasoningType optional,
ReasoningJobWorkingMode reasoningMode optional,
XSD.PositiveInteger reasoningPeriod optional,
@@ -8091,6 +8128,7 @@ type record ReasoningRulesAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
XSD.AnyURI ontologyRef optional,
ReasoningRuleFormat ruleRepresentationFormat optional,
XSD.Base64Binary ruleRepresentation optional,
@@ -8171,6 +8209,7 @@ type record RebootAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -8292,6 +8331,7 @@ with {
variant (choice.choice_list[-]) "untagged";
variant (choice.choice_list[-].group_) "name as 'group'";
variant (choice.choice_list[-].aEAnnc) "name as capitalized";
+ variant (choice.choice_list[-].action_) "name as 'action'";
};
@@ -8308,6 +8348,7 @@ type record RemoteCSEAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
GeoCoordinates location optional,
CseTypeID cseType optional,
PoaList pointOfAccess optional,
@@ -8450,7 +8491,7 @@ with {
type record AggregatedRequestPrimitives
{
- record length(1..infinity) of RequestPrimitive requestPrimitive_list
+ record length(1 .. infinity) of RequestPrimitive requestPrimitive_list
}
with {
variant "name as uncapitalized";
@@ -8745,6 +8786,7 @@ type record ScheduleAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
ScheduleEntries scheduleElement optional,
XSD.Boolean networkCoordinated,
union {
@@ -8830,6 +8872,7 @@ type record SemanticDescriptorAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
SemanticFormat descriptorRepresentation optional,
Sparql semanticOpExec optional,
XSD.Base64Binary descriptor optional,
@@ -8921,6 +8964,7 @@ type record SemanticMashupInstanceAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.AnyURI smjpID optional,
XSD.Base64Binary smjpInputParameter optional,
@@ -9011,6 +9055,7 @@ type record SemanticMashupJobProfileAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
Sparql memberFilter optional,
ListOfURIs smiID optional,
@@ -9170,6 +9215,7 @@ type record SemanticRuleRepositoryAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
@@ -9387,6 +9433,7 @@ type record SoftwareCampaignAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
XSD.Boolean campaignEnabled optional,
ExecStatusType campaignStatus optional,
XSD.String version optional,
@@ -9494,6 +9541,7 @@ type record SoftwareAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -9593,6 +9641,7 @@ type record StateAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
XSD.Boolean stateActive optional,
XSD.AnyURI stateAction optional,
ListOfStateTransitions stateTransitions optional,
@@ -9616,7 +9665,6 @@ with {
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
- variant (choice.choice_list[-].action_) "name as 'action'";
};
@@ -10012,6 +10060,7 @@ type record TimeSeriesInstanceAnnc
Labels labels optional,
Timestamp expirationTime,
XSD.AnyURI link,
+ AnnounceSyncType announceSyncType optional,
AbsRelTimestamp dataGenerationTime optional,
XSD.AnySimpleType content optional,
XSD.NonNegativeInteger sequenceNr optional,
@@ -10049,7 +10098,6 @@ type record TimeSeriesNotificationType
}
with {
variant "name as uncapitalized";
- variant "element";
};
@@ -10108,6 +10156,7 @@ with {
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
+ variant (choice.choice_list[-].action_) "name as 'action'";
};
@@ -10124,6 +10173,7 @@ type record TimeSeriesAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
GeoCoordinates location optional,
XSD.NonNegativeInteger maxNrOfInstances optional,
XSD.NonNegativeInteger maxByteSize optional,
@@ -10218,6 +10268,7 @@ type record TimeSyncBeaconAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
XSD.ID beaconRequester optional,
BeaconCriteria beaconCriteria optional,
XSD.Duration beaconInterval optional,
@@ -10383,6 +10434,7 @@ with {
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
+ variant (choice.choice_list[-].action_) "name as 'action'";
};
@@ -10405,7 +10457,6 @@ type record TriggerPayloadType
}
with {
variant "name as uncapitalized";
- variant "element";
variant (triggerInfoAE_ID) "name as 'triggerInfoAE-ID'";
};
--
GitLab