diff --git a/CDT-enumerationTypes.xsd b/CDT-enumerationTypes.xsd index b6caeea3f08bb815fec47dde6d06ccd78b5d4768..0c2618d26c312710a476c1dfa1ca9e2d2a3eb60c 100644 --- a/CDT-enumerationTypes.xsd +++ b/CDT-enumerationTypes.xsd @@ -159,6 +159,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:enumeration value="65" /> <!-- dependency --> <xs:enumeration value="66" /> + <!-- serviceSubscribedUserProfile --> + <xs:enumeration value="67" /> <!-- accessControlPolicyAnnc --> <xs:enumeration value="10001" /> <!-- AEAnnc --> @@ -702,6 +704,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:enumeration value="65" /> <!-- dependency --> <xs:enumeration value="66" /> + <!-- serviceSubscribedUserProfile --> + <xs:enumeration value="67" /> <!-- accessControlPolicyAnnc --> <xs:enumeration value="10001" /> <!-- AEAnnc --> @@ -2093,5 +2097,17 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:restriction> </xs:simpleType> + <xs:simpleType name="serviceSubscriptionStatus"> + <xs:annotation> + <xs:documentation>Used for status attribute in m2mServiceSubscriptionProfile resource</xs:documentation> + </xs:annotation> + <xs:restriction base="xs:integer"> + <!-- ACTIVE --> + <xs:enumeration value="1" /> + <!-- INACTIVE --> + <xs:enumeration value="2" /> + </xs:restriction> + </xs:simpleType> + </xs:schema> diff --git a/CDT-m2mServiceSubscriptionProfile.xsd b/CDT-m2mServiceSubscriptionProfile.xsd index 51c7e1a2db9ed1247774ef01eb5b74ae233c9951..ba67fa0377a9d0cd8e4fe38fa5f6136c38e70834 100644 --- a/CDT-m2mServiceSubscriptionProfile.xsd +++ b/CDT-m2mServiceSubscriptionProfile.xsd @@ -30,6 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-subscription.xsd" /> <xs:include schemaLocation="CDT-serviceSubscribedNode.xsd" /> <xs:include schemaLocation="CDT-transaction.xsd"/> + <xs:include schemaLocation="CDT-serviceSubscribedUserProfile.xsd"/> <xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource"> <xs:complexType> @@ -40,6 +41,27 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <!-- Resource Specific Attributes --> <xs:element name="M2M-Sub-ID" type="m2m:ID"/> <xs:element name="M2M-SS-ID" type="m2m:ID" minOccurs="0" /> + <xs:element name="status" type="m2m:serviceSubscriptionStatus"/> + <xs:element name="activate" type="xs:boolean"/> + <xs:element name="activationTime" type="m2m:timestamp" minOccurs="0" /> + <xs:element name="deactivationTime" type="m2m:timestamp" minOccurs="0" /> + <xs:element name="serviceSubscriptionDuration" type="xs:duration" minOccurs="0" /> + <xs:element name="currentNumAEs" type="xs:nonNegativeInteger"/> + <xs:element name="maxNumAEs" type="xs:nonNegativeInteger" minOccurs="0" /> + <xs:element name="currentNumNodes" type="xs:nonNegativeInteger"/> + <xs:element name="maxNumNodes" type="xs:nonNegativeInteger" minOccurs="0" /> + <xs:element name="maxNumBytes" type="xs:nonNegativeInteger" minOccurs="0" /> + <xs:element name="maxNumUsers" type="xs:nonNegativeInteger" minOccurs="0" /> + <xs:element name="maxRequestRate" type="xs:nonNegativeInteger" minOccurs="0" /> + <xs:element name="maxNumContainers" type="xs:nonNegativeInteger" minOccurs="0" /> + <xs:element name="maxNumInstancesPerContainer" type="xs:nonNegativeInteger" minOccurs="0" /> + <xs:element name="maxNumTimeSeries" type="xs:nonNegativeInteger" minOccurs="0" /> + <xs:element name="maxNumInstancesPerTimeSeries" type="xs:nonNegativeInteger" minOccurs="0" /> + <xs:element name="maxMembersPerGroup" type="xs:nonNegativeInteger" minOccurs="0" /> + <xs:element name="maxNotificationRate" type="xs:nonNegativeInteger" minOccurs="0" /> + <xs:element name="maxNumFlexContainers" type="xs:nonNegativeInteger" minOccurs="0" /> + <xs:element name="maxNumInstancesPerFlexContainer" type="xs:nonNegativeInteger" minOccurs="0" /> + <xs:element name="defaultAccessControlPrivileges" type="m2m:setOfAcrs" minOccurs="0" /> <!-- Child Resources --> <xs:choice minOccurs="0" maxOccurs="1"> @@ -48,6 +70,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element ref="m2m:serviceSubscribedNode" /> <xs:element ref="m2m:subscription" /> <xs:element ref="m2m:transaction" /> + <xs:element ref="m2m:serviceSubscribedUserProfile" /> </xs:choice> </xs:choice> </xs:sequence> diff --git a/CDT-serviceSubscribedAppRule.xsd b/CDT-serviceSubscribedAppRule.xsd index d35df72a18672fa2e4e658416b33d701683c8d29..125a13fbdaa5b4ad4adbd94d5d056b46f616af9f 100644 --- a/CDT-serviceSubscribedAppRule.xsd +++ b/CDT-serviceSubscribedAppRule.xsd @@ -50,7 +50,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:restriction> </xs:simpleType> </xs:element> - + <xs:element name="allowedUsers" type="m2m:listOfURIs" minOccurs="0" /> + <!-- Child Resources --> <xs:choice minOccurs="0" maxOccurs="1"> <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" /> diff --git a/CDT-serviceSubscribedUserProfile.xsd b/CDT-serviceSubscribedUserProfile.xsd new file mode 100644 index 0000000000000000000000000000000000000000..65b640570b0e977243a894f1bff1d5dca56bef9f --- /dev/null +++ b/CDT-serviceSubscribedUserProfile.xsd @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Copyright Notification + +The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices +contained in the original materials on any copies of the materials and that you comply strictly with these terms. +This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of +any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. +© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved. + +Notice of Disclaimer & Limitation of Liability + +The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand +and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. +No recommendation as to products or vendors is made or should be implied. + +NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, +GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY +PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. +NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO +ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. +oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER. + +--> +<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols" + xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <xs:include schemaLocation="CDT-commonTypes.xsd" /> + <xs:include schemaLocation="CDT-subscription.xsd" /> + <xs:include schemaLocation="CDT-transaction.xsd"/> + + <xs:element name="serviceSubscribedUserProfile" substitutionGroup="m2m:sg_regularResource"> + <xs:complexType> + <xs:complexContent> + <!-- Inherit common attributes --> + <xs:extension base="m2m:regularResource"> + <xs:sequence> + <!-- Resource Specific Attributes --> + <xs:element name="M2M-User-ID" type="m2m:ID"/> + <xs:element name="maxNumAEs" type="xs:nonNegativeInteger" minOccurs="0" /> + <xs:element name="maxNumNodes" type="xs:nonNegativeInteger" minOccurs="0" /> + <xs:element name="maxNumBytes" type="xs:nonNegativeInteger" minOccurs="0" /> + <xs:element name="maxRequestRate" type="xs:nonNegativeInteger" minOccurs="0" /> + <xs:element name="maxNumContainers" type="xs:nonNegativeInteger" minOccurs="0" /> + <xs:element name="maxNumInstancesPerContainer" type="xs:nonNegativeInteger" minOccurs="0" /> + <xs:element name="maxNumTimeSeries" type="xs:nonNegativeInteger" minOccurs="0" /> + <xs:element name="maxNumInstancesPerTimeSeries" type="xs:nonNegativeInteger" minOccurs="0" /> + <xs:element name="maxMembersPerGroup" type="xs:nonNegativeInteger" minOccurs="0" /> + <xs:element name="maxNotificationRate" type="xs:nonNegativeInteger" minOccurs="0" /> + <xs:element name="maxNumFlexContainers" type="xs:nonNegativeInteger" minOccurs="0" /> + <xs:element name="maxNumInstancesPerFlexContainer" type="xs:nonNegativeInteger" minOccurs="0" /> + <xs:element name="defaultAccessControlPrivileges" type="m2m:setOfAcrs" minOccurs="0" /> + + <!-- Child Resources --> + <xs:choice minOccurs="0" maxOccurs="1"> + <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" /> + <xs:choice minOccurs="1" maxOccurs="unbounded"> + <xs:element ref="m2m:subscription" /> + <xs:element ref="m2m:transaction" /> + </xs:choice> + </xs:choice> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> +</xs:schema>