From 4b00660dac37eca625c0929c8dcde60211d9e99e Mon Sep 17 00:00:00 2001
From: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
Date: Fri, 6 Sep 2024 14:27:41 +0200
Subject: [PATCH] oneM2M types based on XSD v4.17.0 baseline
---
OneM2M_Types.ttcn | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/OneM2M_Types.ttcn b/OneM2M_Types.ttcn
index e05bb32..ccb41c4 100644
--- a/OneM2M_Types.ttcn
+++ b/OneM2M_Types.ttcn
@@ -3524,8 +3524,8 @@ type record FlexContainerResource
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag,
XSD.ID creator optional,
- XSD.ID custodian optional,
GeoCoordinates location optional,
+ XSD.ID custodian optional,
XSD.AnyURI containerDefinition,
XSD.AnyURI ontologyRef optional,
XSD.NonNegativeInteger contentSize,
@@ -3584,7 +3584,8 @@ type record FlexContainerInstanceResource
Timestamp expirationTime,
Labels labels optional,
XSD.NonNegativeInteger contentSize,
- XSD.ID originator
+ XSD.ID originator,
+ GeoCoordinates location optional
}
with {
variant "name as uncapitalized";
@@ -4001,6 +4002,7 @@ type record ContentInstance
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag,
XSD.ID creator optional,
+ GeoCoordinates location optional,
ContentInfo contentInfo optional,
XSD.NonNegativeInteger contentSize,
ContentRef contentRef optional,
@@ -4041,6 +4043,7 @@ type record ContentInstanceAnnc
XSD.AnyURI link,
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag,
+ GeoCoordinates location optional,
ContentInfo contentInfo optional,
XSD.NonNegativeInteger contentSize optional,
XSD.AnyURI ontologyRef optional,
@@ -6889,7 +6892,7 @@ type record MgmtCmd
Subscription subscription,
Transaction transaction
} choice_list
- } choice
+ } choice optional
}
with {
variant "name as uncapitalized";
@@ -7213,7 +7216,7 @@ type record Notification_1
} notificationEvent optional,
XSD.Boolean verificationRequest optional,
XSD.Boolean subscriptionDeletion optional,
- XSD.AnyURI subscriptionReference optional,
+ XSD.AnyURI subscriptionReference,
XSD.ID creator optional,
XSD.AnyURI notificationForwardingURI optional,
XSD.ID notificationTarget optional,
@@ -10024,6 +10027,7 @@ type record TimeSeriesInstance
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
+ GeoCoordinates location optional,
AbsRelTimestamp dataGenerationTime,
XSD.AnySimpleType content,
XSD.NonNegativeInteger sequenceNr optional,
@@ -10061,6 +10065,7 @@ type record TimeSeriesInstanceAnnc
Timestamp expirationTime,
XSD.AnyURI link,
AnnounceSyncType announceSyncType optional,
+ GeoCoordinates location optional,
AbsRelTimestamp dataGenerationTime optional,
XSD.AnySimpleType content optional,
XSD.NonNegativeInteger sequenceNr optional,
--
GitLab