diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn index 641ca46abeb6e8517d553aafd92f8fe68a8f3e99..892468c6c9b7c1ab4a111ee75c72d0dc8cd149a5 100644 --- a/LibOneM2M/OneM2M_Types.ttcn +++ b/LibOneM2M/OneM2M_Types.ttcn @@ -2,7 +2,7 @@ * Copyright Notification * No part of this document may be reproduced, in an electronic retrieval system or otherwise, except as authorized by written permission. * The copyright and the foregoing restriction extend to reproduction in all media. - * © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). + * � 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). * All rights reserved. * * @author oneM2M/ETSI @@ -1432,14 +1432,11 @@ with { type enumerated PermittedMediaTypes { - applicationcbor, - applicationjson, - applicationxml + cbor, + json, + xml } with { - variant "text 'applicationcbor' as 'application/cbor'"; - variant "text 'applicationjson' as 'application/json'"; - variant "text 'applicationxml' as 'application/xml'"; variant "name as uncapitalized"; }; @@ -1549,13 +1546,7 @@ with { }; -type XSD.String DescriptorRepresentation (pattern "application/rdf\+xml:1") -with { - variant "name as uncapitalized"; -}; - - -type XSD.String E2eCompactJWS (pattern "([a-zA-Z0-9\-_=]+).([a-zA-Z0-9\-_=]#(0,)).([A-Za-z0-9\-_=])+") +type XSD.String E2eCompactJWS (pattern "([a-zA-Z0-9\-_=]+).([a-zA-Z0-9\-_=]*).([A-Za-z0-9\-_=])+") with { variant "name as uncapitalized"; }; @@ -2305,7 +2296,7 @@ with { type record DynAuthDasRequest { XSD.ID originator, - ResourceType targetedResourceType, + ResourceType targetedResourceType optional, Operation operation, record { Ipv4 ipv4Address optional, @@ -2314,7 +2305,7 @@ type record DynAuthDasRequest LocationRegion originatorLocation optional, record length(1 .. infinity) of RoleID originatorRoleIDs optional, AbsRelTimestamp requestTimestamp optional, - XSD.AnyURI targetedResourceID optional, + XSD.AnyURI targetedResourceID, AbsRelTimestamp proposedPrivilegesLifetime optional, record length(1 .. infinity) of RoleID roleIDsFromACPs optional, record length(1 .. infinity) of TokenID tokenIDs optional @@ -3480,7 +3471,6 @@ type enumerated ResponseStatusCode int4008(4008), int4015(4015), int4101(4101), - int4102(4102), int4103(4103), int4104(4104), int4105(4105), @@ -3496,7 +3486,9 @@ type enumerated ResponseStatusCode int4115(4115), int4116(4116), int4117(4117), - int4124(4124), + int4125(4125), + int4126(4126), + int4128(4128), int5000(5000), int5001(5001), int5103(5103), @@ -3512,7 +3504,6 @@ type enumerated ResponseStatusCode int5210(5210), int5211(5211), int5212(5212), - int5219(5219), int5220(5220), int6003(6003), int6005(6005), @@ -4159,6 +4150,21 @@ with { }; +type enumerated SemanticFormat +{ + int2(2), + int3(3), + int4(4), + int5(5), + int6(6), + int7(7) +} +with { + variant "useNumber"; + variant "name as uncapitalized"; +}; + + type record EventConfig { ResourceName resourceName, @@ -4604,7 +4610,7 @@ type record Group MemberType memberType, XSD.NonNegativeInteger currentNrOfMembers, XSD.PositiveInteger maxNrOfMembers, - record length(0 .. infinity) of XSD.AnyURI memberIDs,//TODO A list that can be empty + record of XSD.AnyURI memberIDs, ListOfURIs membersAccessControlPolicyIDs optional, XSD.Boolean memberTypeValidated optional, ConsistencyStrategy consistencyStrategy optional, @@ -5569,7 +5575,7 @@ with { }; -type record length(0 .. infinity) of XSD.AnyURI URIList //TODO Allow URIList to be empty as defined in PRO +type record of XSD.AnyURI URIList with { variant "name as uncapitalized"; variant "list"; @@ -5757,7 +5763,7 @@ type record SemanticDescriptor ListOfURIs announceTo optional, record length(1 .. infinity) of XSD.NCName announcedAttribute optional, XSD.ID creator optional, - DescriptorRepresentation descriptorRepresentation optional, + SemanticFormat descriptorRepresentation optional, Sparql semanticOpExec optional, XSD.Base64Binary descriptor, XSD.AnyURI ontologyRef optional, @@ -5793,7 +5799,7 @@ type record SemanticDescriptorAnnc Timestamp expirationTime, XSD.AnyURI link, ListOfURIs dynamicAuthorizationConsultationIDs optional, - DescriptorRepresentation descriptorRepresentation optional, + SemanticFormat descriptorRepresentation optional, Sparql semanticOpExec optional, XSD.Base64Binary descriptor optional, XSD.AnyURI ontologyRef optional, @@ -6331,7 +6337,7 @@ type record TimeSeriesInstance ListOfURIs announceTo optional, record length(1 .. infinity) of XSD.NCName announcedAttribute optional, AbsRelTimestamp dataGenerationTime, - XSD.AnySimpleType content,//FIXME Use AnySimpleType instead + XSD.AnySimpleType content, XSD.NonNegativeInteger sequenceNr optional, XSD.NonNegativeInteger contentSize } @@ -6355,7 +6361,7 @@ type record TimeSeriesInstanceAnnc Timestamp expirationTime, XSD.AnyURI link, AbsRelTimestamp dataGenerationTime optional, - XSD.AnySimpleType content optional,//FIXME Use AnySimpleType instead + XSD.AnySimpleType content optional, XSD.NonNegativeInteger sequenceNr optional, XSD.NonNegativeInteger contentSize optional } @@ -6380,7 +6386,7 @@ type record TimeSeries ListOfURIs dynamicAuthorizationConsultationIDs optional, ListOfURIs announceTo optional, record length(1 .. infinity) of XSD.NCName announcedAttribute optional, - XSD.ID creator, + XSD.ID creator optional, XSD.NonNegativeInteger maxNrOfInstances optional, XSD.NonNegativeInteger maxByteSize optional, XSD.NonNegativeInteger maxInstanceAge optional, @@ -7396,7 +7402,7 @@ group OptionalResourceTypes { MemberType memberType optional, XSD.NonNegativeInteger currentNrOfMembers optional, XSD.PositiveInteger maxNrOfMembers optional, - record length(0 .. infinity) of XSD.AnyURI memberIDs optional,//TODO A list that can be empty + record of XSD.AnyURI memberIDs optional, ListOfURIs membersAccessControlPolicyIDs optional, XSD.Boolean memberTypeValidated optional, ConsistencyStrategy consistencyStrategy optional, @@ -7925,7 +7931,7 @@ group OptionalResourceTypes { ListOfURIs announceTo optional, record length(1 .. infinity) of XSD.NCName announcedAttribute optional, XSD.ID creator optional, - DescriptorRepresentation descriptorRepresentation optional, + SemanticFormat descriptorRepresentation optional, Sparql semanticOpExec optional, XSD.Base64Binary descriptor optional, XSD.AnyURI ontologyRef optional, @@ -7962,7 +7968,7 @@ group OptionalResourceTypes { Timestamp expirationTime optional, XSD.AnyURI link optional, ListOfURIs dynamicAuthorizationConsultationIDs optional, - DescriptorRepresentation descriptorRepresentation optional, + SemanticFormat descriptorRepresentation optional, Sparql semanticOpExec optional, XSD.Base64Binary descriptor optional, XSD.AnyURI ontologyRef optional, diff --git a/OneM2M_Testcases_AE_Release_1.ttcn b/OneM2M_Testcases_AE_Release_1.ttcn index 7826dde118589a6151d5b62394c5730b945cdc54..e6d811009352fbbdfe3cbe337ef0e4c004fd6ceb 100644 --- a/OneM2M_Testcases_AE_Release_1.ttcn +++ b/OneM2M_Testcases_AE_Release_1.ttcn @@ -634,7 +634,7 @@ module OneM2M_Testcases_AE_Release_1 { var template UtTriggerPrimitive v_utRequest := m_utCreateAe; var template RequestPrimitive v_createAe := mw_createAe; var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute ContentSerialization"; - v_utRequest.requestPrimitive.primitiveContent.aE.contentSerialization := {applicationxml}; + v_utRequest.requestPrimitive.primitiveContent.aE.contentSerialization := {xml}; v_utRequest.forcedFields := {{name := "contentSerialization", value_ := "UNINITIALIZED"}}; v_createAe.primitiveContent.aE.contentSerialization := ?;//Check value other than UNINITIALIZED, done by typing v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action)); @@ -1161,7 +1161,7 @@ module OneM2M_Testcases_AE_Release_1 { var template RequestPrimitive v_expectedUpdateRequestAe; var template UtTriggerPrimitive v_utRequest := m_utUpdateAe; var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute contentSerialization to "; - v_utRequest.requestPrimitive.primitiveContent.aE.contentSerialization := {applicationxml}; + v_utRequest.requestPrimitive.primitiveContent.aE.contentSerialization := {xml}; v_utRequest.forcedFields := {{name := "contentSerialization", value_ := "UNINITIALIZED"}}; v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentUpdateAe;