From c28b5a251515b8745a7fd0bf37ea917b1d719357 Mon Sep 17 00:00:00 2001
From: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
Date: Tue, 13 Sep 2022 15:20:57 +0200
Subject: [PATCH] oneM2M types based on XSD v4.11.0 baseline
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
OneM2M_Types.ttcn | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/OneM2M_Types.ttcn b/OneM2M_Types.ttcn
index 480c0de..580682d 100644
--- a/OneM2M_Types.ttcn
+++ b/OneM2M_Types.ttcn
@@ -15,7 +15,7 @@ module OneM2M_Types {
import from XSD all;
-import from OneM2M_TypesAndValues {type Resource_2; type ResourceTypeList_1; type PrimitiveContent; type RecordOfDynAuthJWT};//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;const c_point;};//TODO Manually added until XSD files are updated
import from OneM2M_Types_homeDevice {type Battery; type BatteryAnnc};
@@ -2145,13 +2145,13 @@ with {
};
-type XSD.String ReleaseVersion (pattern "(2a|3|4)") //FIXME All available releases backwards till 2a. XSD will define it as this
+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
with {
variant "name as uncapitalized";
};
-type XSD.String ApplicableReleaseVersion (pattern "(1|2|2a|3|4)") //FIXME All available release backwards. XSD will define it as this
+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
with {
variant "name as uncapitalized";
};
@@ -2180,7 +2180,7 @@ with {
};
-type XSD.String ListOfCoordinates (pattern "(\[(\[[-+]#(0,1)([1-8]#(0,1)\d(.\d#(1,))#(0,1)|90(.0#(1,))#(0,1)),[\q{0,0,0,32}\t]#(0,)[-+]#(0,1)(180(.0#(1,))#(0,1)|((1[0-7]\d)|([1-9]#(0,1)\d))(.\d#(1,))#(0,1))(,\d#(1,))#(0,1)\])(,(\[[-+]#(0,1)([1-8]#(0,1)\d(.\d#(1,))#(0,1)|90(.0#(1,))#(0,1)),[\q{0,0,0,32}\t]#(0,)[-+]#(0,1)(180(.0#(1,))#(0,1)|((1[0-7]\d)|([1-9]#(0,1)\d))(.\d#(1,))#(0,1))(,\d#(1,))#(0,1)\]))#(1,)(\]))|(\[[-+]#(0,1)([1-8]#(0,1)\d(.\d#(1,))#(0,1)|90(.0#(1,))#(0,1)),[\q{0,0,0,32}\t]#(0,)[-+]#(0,1)(180(.0#(1,))#(0,1)|((1[0-7]\d)|([1-9]#(0,1)\d))(.\d#(1,))#(0,1))(,\d#(1,))#(0,1)\])")
+type XSD.String ListOfCoordinates (pattern "{c_multipolygon}|{c_polygon}|{c_multiLineString}|{c_lineStringOrMultipoint}|{c_multipoint}|{c_point}")
with {
variant "name as uncapitalized";
};
@@ -4058,6 +4058,7 @@ type record CrossResourceSubscription
XSD.ID creator,
ListOfURIs regularResourcesAsTarget optional,
ListOfURIs subscriptionResourcesAsTarget optional,
+ ListOfURIs regularResourcesAsTargetSubscriptions optional,
TimeWindowType timeWindowType,
XSD.Duration timeWindowSize,
EventNotificationCriteriaSet eventNotificationCriteriaSet optional,
--
GitLab