diff --git a/DCFG-MAFClientRegCfg.xsd b/DCFG-MAFClientRegCfg.xsd index 348a321b0afbc7fb33fd76fb2713cbf2da4b3749..8817ee5d474a42151aaa33d5a453d4796b23b702 100644 --- a/DCFG-MAFClientRegCfg.xsd +++ b/DCFG-MAFClientRegCfg.xsd @@ -23,9 +23,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR --> -<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" +<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" - xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" + xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified" attributeFormDefault="unqualified"> diff --git a/DCFG-MEFClientRegCfg.xsd b/DCFG-MEFClientRegCfg.xsd index 593fa57933e2a05a0cc8865b15eb8cb709831884..6d1259627c1d21f9b817fe4b0f5509dbd0004470 100644 --- a/DCFG-MEFClientRegCfg.xsd +++ b/DCFG-MEFClientRegCfg.xsd @@ -23,9 +23,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR --> -<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" +<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" - xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" + xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified" attributeFormDefault="unqualified"> diff --git a/DCFG-OAuth2.xsd b/DCFG-OAuth2.xsd index 1b9ba3f4eaa6dde3b0c98c146d2ae41e04c975c1..67ae219d040e522ce9fa97c75232154135db9a6c 100644 --- a/DCFG-OAuth2.xsd +++ b/DCFG-OAuth2.xsd @@ -22,9 +22,9 @@ ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCI 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="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" +<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" - xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" + xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:sec="https://git.onem2m.org/XMLSchemas/ts-0003/tree/4.0.0" elementFormDefault="unqualified" attributeFormDefault="unqualified"> diff --git a/DCFG-authenticationProfile.xsd b/DCFG-authenticationProfile.xsd index 81476919c79e1e2cdd861c842fb56f9e3e533437..e186d7fbcedf7996267a22ce24f4889bb802412f 100644 --- a/DCFG-authenticationProfile.xsd +++ b/DCFG-authenticationProfile.xsd @@ -22,9 +22,9 @@ ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCI 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="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" +<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" - xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" + xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:sec="https://git.onem2m.org/XMLSchemas/ts-0003/tree/4.0.0" elementFormDefault="unqualified" attributeFormDefault="unqualified"> diff --git a/DCFG-commonTypes.xsd b/DCFG-commonTypes.xsd index 0b1c390083b873466ff467ff595f45c143dd487b..406d7188087dc8f39f4c90a7661fd0d346ae809b 100644 --- a/DCFG-commonTypes.xsd +++ b/DCFG-commonTypes.xsd @@ -23,8 +23,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR --> <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" - xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" + targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" + xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified"> <!-- <xs:include schemaLocation="CDT-enumerationTypes" /> --> @@ -42,6 +42,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:restriction base="xs:anyURI"/> </xs:simpleType> + <xs:simpleType name="ssid"> + <xs:restriction base="xs:anyURI"/> + </xs:simpleType> <!--********************** --> <!-- Enumerated Types --> @@ -160,10 +163,64 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:restriction> </xs:simpleType> + <xs:simpleType name="wifiConnectionStatus"> + <xs:annotation> + <xs:documentation>Used to indicate WiFi connection status</xs:documentation> + </xs:annotation> + <xs:restriction base="xs:integer"> + <!-- Disconnected --> + <xs:enumeration value="0"/> + <!-- Connected --> + <xs:enumeration value="1"/> + <!-- Idle --> + <xs:enumeration value="2"/> + <!-- No SSID available --> + <xs:enumeration value="3"/> + <!-- Scan completed --> + <xs:enumeration value="4"/> + <!-- Failed --> + <xs:enumeration value="5"/> + <!-- Lost --> + <xs:enumeration value="6"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="wifiEncryptionType"> + <xs:annotation> + <xs:documentation>Used for indicating which WiFi encryption protocol is used to provide security in wireless network</xs:documentation> + </xs:annotation> + <xs:restriction base="xs:integer"> + <!-- none --> + <xs:enumeration value="1"/> + <!-- WEP --> + <xs:enumeration value="2"/> + <!-- WPA Personal --> + <xs:enumeration value="3"/> + <!-- WPA2 Personal --> + <xs:enumeration value="4"/> + <!-- WPA3 Personal --> + <xs:enumeration value="5"/> + <!-- WPA Enterprise --> + <xs:enumeration value="6"/> + <!-- WPA2 Enterprise --> + <xs:enumeration value="7"/> + <!-- WPA3 Enterprise --> + <xs:enumeration value="8"/> + </xs:restriction> + </xs:simpleType> <!--********************** --> <!-- Complex Types --> <!--********************** --> + <xs:complexType name="wifiCredentials"> + <xs:sequence> + <xs:element name="encryptionType" type="dcfg:encryptionType" /> + <xs:element name="username" type="xs:string" minOccurs="0" /> + <xs:element name="password" type="xs:string" minOccurs="0" /> + <xs:element name="wep.key" type="xs:string" minOccurs="0" /> + <xs:element name="wpa.psk" type="xs:string" minOccurs="0" /> + </xs:sequence> + </xs:complexType> </xs:schema> diff --git a/DCFG-dataCollection.xsd b/DCFG-dataCollection.xsd index b8e6b02d3979c4cd0370a7a6178fa1907ae17912..b11b466dbc099d02a8013f3e038676f9d84bf156 100644 --- a/DCFG-dataCollection.xsd +++ b/DCFG-dataCollection.xsd @@ -23,9 +23,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR --> -<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" +<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" - xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" + xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified" attributeFormDefault="unqualified"> diff --git a/DCFG-myCertFileCred.xsd b/DCFG-myCertFileCred.xsd index e5e3adce00cf9ff4fe40f52dfe2ea99bfb33bb12..e453292a9c5af248ccab59562073c5b5f5683fb0 100644 --- a/DCFG-myCertFileCred.xsd +++ b/DCFG-myCertFileCred.xsd @@ -23,8 +23,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR --> -<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" - xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" +<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" + xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" xmlns:sec="https://git.onem2m.org/XMLSchemas/ts-0003/tree/4.0.0" elementFormDefault="unqualified" attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> diff --git a/DCFG-registration.xsd b/DCFG-registration.xsd index 1330e957610eead644af3ceac66cee747a6add22..0b5b3db72291c2ae4301d265a914e2eba82b17ce 100644 --- a/DCFG-registration.xsd +++ b/DCFG-registration.xsd @@ -23,8 +23,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR --> -<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" - xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" +<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" + xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" elementFormDefault="unqualified" attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-subscription.xsd" /> diff --git a/DCFG-trustAnchorCred.xsd b/DCFG-trustAnchorCred.xsd index ed8e780a3ddd62e9c6bf0acfef18ac0fff73dbe7..38a900de5488f1c13eb39290e239c32bdd5a6836 100644 --- a/DCFG-trustAnchorCred.xsd +++ b/DCFG-trustAnchorCred.xsd @@ -23,9 +23,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR --> -<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" +<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" - xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.0" + xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified" attributeFormDefault="unqualified"> diff --git a/DCFG-wifiClient.xsd b/DCFG-wifiClient.xsd new file mode 100644 index 0000000000000000000000000000000000000000..5da102498adf29b52724a00a72ead84a0fe03780 --- /dev/null +++ b/DCFG-wifiClient.xsd @@ -0,0 +1,79 @@ +<?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. +© 2017, 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="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" + xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" + xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.0.1" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:sec="https://git.onem2m.org/XMLSchemas/ts-0003/tree/4.0.0" + elementFormDefault="unqualified" attributeFormDefault="unqualified"> + + <xs:include schemaLocation="DCFG-commonTypes.xsd" /> + + <xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-subscription.xsd" /> + <xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-commonTypes.xsd" /> + <xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0003/tree/4.0.0" schemaLocation="SEC-commonTypes.xsd" /> + + <xs:element name="wifiClient" substitutionGroup="m2m:sg_mgmtResource"> + <xs:complexType> + <xs:complexContent> + <!-- Inherit Common Attributes from data type "mgmtResource" --> + <xs:extension base="m2m:mgmtResource"> + <!-- Resource Specific Attributes --> + <xs:sequence> + <xs:element name="ssid" type="dcfg:ssid"/> + <xs:element name="credentials" type="dcfg:wifiCredentials" minOccurs="0"/> + <xs:element name="macAddress" type="xs:string" minOccurs="0"/> + <xs:element name="channel" type="xs:integer" minOccurs="0"/> + <xs:element name="connectionStatus" type="dcfg:wifiConnectionStatus" minOccurs="0"/> + <xs:element name="scan" type="xs:boolean" /> + <xs:element name="scanResult" type="dcfg:listOfSsids" minOccurs="0"/> + <xs:element name="update" type="xs:boolean" /> + <xs:element name="updateStatus" type="m2m:actionStatus" /> + <xs:element name="toggleRadioStatus" type="xs:boolean" minOccurs="0"/> + <xs:element name="radioStatus" type="xs:boolean" minOccurs="0"/> + + <!-- Child Resources --> + <xs:choice minOccurs="0" maxOccurs="1"> + <xs:element name="childResource" type="m2m:childResourceRef" + maxOccurs="unbounded"/> + <xs:element ref="m2m:subscription" maxOccurs="unbounded"/> + </xs:choice> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + + <!-- "listOfSsids" --> + <xs:simpleType name="listOfSsids"> + <xs:restriction> + <xs:simpleType> + <xs:list itemType="dcfg:ssid" /> + </xs:simpleType> + <xs:minLength value="1" /> + </xs:restriction> + </xs:simpleType> + +</xs:schema> diff --git a/README.md b/README.md index fe8a70f6f02673d18d97025af9426edafa854399..16ae7ff8dd799e4e8b113db09d3c81612892f60f 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,8 @@ This is the repository for developing XML schema for the reource types defined i \<OAuth2\> +\<wifiClient\> + DCFG-commonTypes.xsd defines data types common to all resource types Note: The required xsd files CDT-commonTypes can be downloaded from