diff --git a/CDT-commonTypes.xsd b/CDT-commonTypes.xsd index 031e35020f09b17426f88f9064f049ada13dd278..c63923c0141192eff3e18c6338f0bee9e6fc82b5 100644 --- a/CDT-commonTypes.xsd +++ b/CDT-commonTypes.xsd @@ -271,9 +271,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <!-- auxiliary data type required to define "serializations" below --> <xs:simpleType name="permittedMediaTypes"> <xs:restriction base="m2m:typeOfContent"> - <xs:enumeration value="application/xml" /> - <xs:enumeration value="application/json" /> - <xs:enumeration value="application/cbor" /> + <xs:enumeration value="xml" /> + <xs:enumeration value="json" /> + <xs:enumeration value="cbor" /> </xs:restriction> </xs:simpleType> diff --git a/CDT-enumerationTypes.xsd b/CDT-enumerationTypes.xsd index fcb08d21566b22487b9204ecacfb73adc6548a1f..904161962228519de4626a6093f2f5af9f498260 100644 --- a/CDT-enumerationTypes.xsd +++ b/CDT-enumerationTypes.xsd @@ -388,6 +388,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:enumeration value="4126" /> <!-- OPERATION_DENIED_BY_REMOTE_ENTITY --> <xs:enumeration value="4127" /> + <!-- SERVICE_SUBSCRIPTION_NOT_ESTABLISHED --> + <xs:enumeration value="4128" /> <!-- INTERNAL_SERVER_ERROR --> <xs:enumeration value="5000" /> @@ -1378,29 +1380,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:restriction> </xs:simpleType> - - <xs:simpleType name="serializationType"> - <xs:annotation> - <xs:documentation>Used for the triggerInfoSrializationType field of trigger requests on Mcn</xs:documentation> - </xs:annotation> - <xs:restriction base="xs:integer"> - <!-- XML --> - <xs:enumeration value="1" /> - <!-- JSON --> - <xs:enumeration value="2" /> - <!-- XML + JSON --> - <xs:enumeration value="3" /> - <!-- CBOR --> - <xs:enumeration value="4" /> - <!-- XML + CBOR --> - <xs:enumeration value="5" /> - <!-- JSON + CBOR --> - <xs:enumeration value="6" /> - <!-- XML + JSON + CBOR --> - <xs:enumeration value="7" /> - </xs:restriction> - </xs:simpleType> - <xs:simpleType name="authorizationDecision"> <xs:annotation> <xs:documentation>Used for the decision attribute of the of authorizationDecision resource</xs:documentation> diff --git a/CDT-triggerPayload.xsd b/CDT-triggerPayload.xsd index 4b9bb9d05046687077a4df772646d84feb090f83..8703dc73be3f039fab0973c080964c9856573b7d 100644 --- a/CDT-triggerPayload.xsd +++ b/CDT-triggerPayload.xsd @@ -39,16 +39,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element name="triggerInfoOperation" type="m2m:operation" minOccurs="0"/> <xs:element name="targetedResourceType" type="m2m:resourceType" minOccurs="0"/> <xs:element name="triggerInfoAE-ID" type="m2m:ID" minOccurs="0"/> - <xs:element name="triggerInfoSerializationTypes" minOccurs="0"> - <xs:simpleType> - <xs:restriction> - <xs:simpleType> - <xs:list itemType="m2m:serializationType"/> - </xs:simpleType> - <xs:minLength value="1"/> - </xs:restriction> - </xs:simpleType> - </xs:element> + <xs:element name="triggerInfoSerializationTypes" type="m2m:serializations" minOccurs="0"/> </xs:sequence> </xs:complexType> </xs:element>