diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index 8bd912ab55244f67f918ebd937d56a2367d49d4d..9e68b81e31b69cd2821f4547277e69b1a3ffa740 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Types.ttcn $
- * $Id: OneM2M_Types.ttcn 238 2017-03-23 17:39:11Z reinaortega $
+ * $Id: OneM2M_Types.ttcn 257 2017-05-16 06:05:46Z reinaortega $
* @desc OneM2M data types module
*
*/
@@ -15,77 +15,6 @@ module OneM2M_Types {
import from XSD all;
-/* ******************************************
- * oneM2M Abstract Service Primitives
- * ******************************************
-*/
- /**
- * @desc Type for the oneM2M primitives exchange
- * @member primitive oneM2M primitive
- * @member host IP Address of the destination
- * @member xmlNamespace XML Namespace to be used
- * @member protocolBinding Protocol binding to be used
- * @member serialization Serialization to be used
- * @member forcedFields Attributes that need to be processed differently by the test adapter:
- * - empty fields (for instance, for attribute deletion), i.e. <labels></labels> -> value_ to be omitted
- * - invalid values, i.e. <maxNrOfInstances>-1</maxNrOfInstances>
- */
- type record MsgOut {
- union {
- RequestPrimitive requestPrimitive,
- ResponsePrimitive responsePrimitive
- } primitive,
- charstring host optional,
- charstring xmlNamespace optional,
- charstring protocolBinding optional,
- charstring serialization optional,
- AttributeAux_list forcedFields optional
- }
- with {
- encode ""
- }
-
- /**
- * @desc Type for the oneM2M primitives exchange
- * @member primitive oneM2M primitive
- */
- type record MsgIn {
- union {
- RequestPrimitive requestPrimitive,
- ResponsePrimitive responsePrimitive
- } primitive
- }
- with {
- encode ""
- }
-
- type record AcRequestPrimitive {
- charstring event,
- anytype data
- }
- with {
- encode "adapter";
- }
-
- type record AcResponsePrimitive {
- charstring event,
- anytype data
- }
- with {
- encode "adapter";
- }
-
- type record AttributeAux {
- XSD.NCName name,
- charstring value_ optional
- };
-
- type record of AttributeAux AttributeAux_list;
-
-/* **********************************
-* oneM2M Resource primitives
-* ***********************************
-*/
type record AccessControlPolicy
{
@@ -1489,7 +1418,7 @@ with {
};
-type XSD.String ContentInfo //FIXME To be fixed (pattern "[\w/!#$\^_.+\q{0, 0, 0, 38}&\-]+((:[0-2])#(0,1))+((:[0-5])#(0,1))") TODO To verify pattern
+type XSD.String ContentInfo //FIXME To be fixed (pattern "[\w/!#$\^_.+\q{0, 0, 0, 38}&\-]+((:[0-2])#(0,1))+((:[0-5])#(0,1))")
with {
variant "name as uncapitalized";
};
@@ -1691,7 +1620,7 @@ with {
};
-type record of anytype Contents; // FIXME added by AMB, necessary for Codec
+type record of anytype Contents; // FIXME necessary for Codec
type record PrimitiveContent
{
@@ -1703,14 +1632,15 @@ type record PrimitiveContent
}
with {
variant "name as uncapitalized";
- //variant (choice_list) "untagged";
- //variant (choice_list[-]) "untagged";
- //variant (choice_list[-].elem) "anyElement from 'http://www.onem2m.org/xml/protocols'";
- //variant (choice_list[-].elem_1) "name as 'elem'";
- //variant (choice_list[-].elem_1) "anyElement except unqualified, 'http://www.onem2m.org/xml/protocols'";
+// variant (choice) "untagged";
+// variant (choice.elem) "anyElement from 'http://www.onem2m.org/xml/protocols'";
+// variant (choice.elem_1) "name as 'elem'";
+// variant (choice.elem_1) "anyElement except unqualified, 'http://www.onem2m.org/xml/protocols'";
};
+
+
type record FilterCriteria
{
Timestamp createdBefore optional,
@@ -1977,7 +1907,7 @@ type record AccessControlRule
record of ScheduleEntry accessControlWindow_list,
record {
record length(1 .. infinity) of Ipv4 ipv4Addresses optional,//FIXME It must be optional
- record length(1 .. infinity) of Ipv6 ipv6Addresses optional//FIXME It must be optional
+ record length(1 .. infinity) of Ipv6 ipv6Addresses optional //FIXME It must be optional
} accessControlIpAddresses optional,
LocationRegion accessControlLocationRegion optional
} accessControlContexts_list,
@@ -3388,7 +3318,8 @@ type enumerated ResultContent
int5(5),
int6(6),
int7(7),
- int8(8)
+ int8(8),
+ int9(9)
}
with {
variant "useNumber";
@@ -3433,6 +3364,7 @@ type enumerated ResponseStatusCode
int4113(4113),
int4114(4114),
int4115(4115),
+ int4116(4116),
int5000(5000),
int5001(5001),
int5103(5103),
@@ -4498,6 +4430,7 @@ type record Group
XSD.Boolean memberTypeValidated optional,
ConsistencyStrategy consistencyStrategy optional,
XSD.String groupName optional,
+ XSD.Boolean semanticSupportIndicator optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
@@ -4513,6 +4446,8 @@ with {
variant (announcedAttribute) "list";
//variant (memberTypeValidated) "text 'true' as '1'";
//variant (memberTypeValidated) "text 'false' as '0'";
+ //variant (semanticSupportIndicator) "text 'true' as '1'";
+ //variant (semanticSupportIndicator) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -4542,6 +4477,7 @@ type record GroupAnnc
XSD.Boolean memberTypeValidated optional,
ConsistencyStrategy consistencyStrategy optional,
XSD.String groupName optional,
+ XSD.Boolean semanticSupportIndicator optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
@@ -4558,6 +4494,8 @@ with {
variant (memberIDs) "list";
//variant (memberTypeValidated) "text 'true' as '1'";
//variant (memberTypeValidated) "text 'false' as '0'";
+ //variant (semanticSupportIndicator) "text 'true' as '1'";
+ //variant (semanticSupportIndicator) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -4800,6 +4738,7 @@ type record Node
record length(1 .. infinity) of XSD.NCName announcedAttribute,
NodeID nodeID,
XSD.ID hostedCSELink optional,
+ XSD.String mgmtClientAddress optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
@@ -4849,6 +4788,7 @@ type record NodeAnnc
ListOfURIs dynamicAuthorizationConsultationIDs optional,
NodeID nodeID,
XSD.ID hostedCSELink optional,
+ XSD.String mgmtClientAddress optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
@@ -5340,8 +5280,8 @@ type record RequestPrimitive
FilterCriteria filterCriteria optional,
DiscResType discoveryResultType optional,
record length(1 .. infinity) of DynAuthJWT tokens optional,//TODO it must be optional
- record length(1 .. infinity) of TokenID tokenIDs optional,//TODO it must be optional
- record length(1 .. infinity) of XSD.NCName localTokenIDs optional,//TODO it must be optional
+ record length(1 .. infinity) of TokenID tokenIDs optional,
+ record length(1 .. infinity) of XSD.NCName localTokenIDs optional,
XSD.Boolean tokenRequestIndicator optional
}
with {
@@ -6253,8 +6193,6 @@ type record TimeSeries
XSD.NonNegativeInteger missingDataCurrentNr optional,
XSD.NonNegativeInteger missingDataDetectTimer optional,
XSD.AnyURI ontologyRef optional,
- XSD.AnyURI latest,
- XSD.AnyURI oldest,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
@@ -6468,6 +6406,79 @@ with {
variant (choice.choice_list[-].scheduleAnnc_list) "untagged";
variant (choice.choice_list[-].scheduleAnnc_list[-]) "name as 'scheduleAnnc'";
};
+/* ******************************************
+ * oneM2M Abstract Service Primitives
+ * ******************************************
+*/
+ /**
+ * @desc Type for the oneM2M primitives exchange
+ * @member primitive oneM2M primitive
+ * @member host IP Address of the destination
+ * @member xmlNamespace XML Namespace to be used
+ * @member protocolBinding Protocol binding to be used
+ * @member serialization Serialization to be used
+ * @member forcedFields Attributes that need to be processed differently by the test adapter:
+ * - empty fields (for instance, for attribute deletion), i.e. <labels></labels> -> value_ to be omitted
+ * - invalid values, i.e. <maxNrOfInstances>-1</maxNrOfInstances>
+ */
+ type record MsgOut {
+ union {
+ RequestPrimitive requestPrimitive,
+ ResponsePrimitive responsePrimitive
+ } primitive,
+ charstring host optional,
+ charstring xmlNamespace optional,
+ charstring protocolBinding optional,
+ charstring serialization optional,
+ AttributeAux_list forcedFields optional
+ }
+ with {
+ encode ""
+ }
+
+ /**
+ * @desc Type for the oneM2M primitives exchange
+ * @member primitive oneM2M primitive
+ */
+ type record MsgIn {
+ union {
+ RequestPrimitive requestPrimitive,
+ ResponsePrimitive responsePrimitive
+ } primitive
+ }
+ with {
+ encode ""
+ }
+
+ type record AcRequestPrimitive {
+ charstring event,
+ anytype data
+ }
+ with {
+ encode "adapter";
+ }
+
+ type record AcResponsePrimitive {
+ charstring event,
+ anytype data
+ }
+ with {
+ encode "adapter";
+ }
+
+ type record AttributeAux {
+ XSD.NCName name,
+ charstring value_ optional
+ };
+
+ type record of AttributeAux AttributeAux_list;
+
+/* **********************************
+* oneM2M Resource primitives
+* ***********************************
+*/
+
+
/* Additional types */