diff --git a/CDT-accessControlPolicy-v0_8_0.xsd b/CDT-accessControlPolicy-v0_8_0.xsd index c42aefdbeb2d4537e5e29699bd76b2560c945c55..b2978adf2d5bd9c12476b4319bbaddc587c581c8 100644 --- a/CDT-accessControlPolicy-v0_8_0.xsd +++ b/CDT-accessControlPolicy-v0_8_0.xsd @@ -137,36 +137,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:sequence> </xs:complexType> - <xs:simpleType name="accessControlOperation"> - <xs:annotation> - <xs:documentation>Shall be considered for access control policy check by the CSE</xs:documentation> - </xs:annotation> - <xs:restriction base="xs:integer"> - <!-- Create --> - <xs:enumeration value="1" /> - <!-- Retrieve --> - <xs:enumeration value="2" /> - <!-- Update --> - <xs:enumeration value="3" /> - <!-- Delete --> - <xs:enumeration value="4" /> - <!-- Notify --> - <xs:enumeration value="5" /> - <!-- Discover --> - <xs:enumeration value="6" /> - </xs:restriction> - </xs:simpleType> - <!-- TODO: update this --> + <!-- TODO: check if a CR to TS-0004 or TS-0003 is needed --> <xs:simpleType name="countryCode"> <xs:annotation> - <xs:documentation>2-character country code </xs:documentation> + <xs:documentation>2-character country code as defined by ISO-3166</xs:documentation> </xs:annotation> - <xs:restriction base="xs:integer"> - <!-- India --> - <xs:enumeration value="91" /> - <!-- United States of America --> - <xs:enumeration value="01" /> + <xs:restriction base="xs:string"> + <xs:pattern value="[A-Z]{2}"></xs:pattern> </xs:restriction> </xs:simpleType> diff --git a/CDT-enumerationTypes-v0_8_0.xsd b/CDT-enumerationTypes-v0_8_0.xsd index 8faf7c4f766c4340e987db3b830dafbca3cf6520..16eeeec24247c5bcaea891c9ab9bfc4014df8c98 100644 --- a/CDT-enumerationTypes-v0_8_0.xsd +++ b/CDT-enumerationTypes-v0_8_0.xsd @@ -163,38 +163,25 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:restriction> </xs:simpleType> - <!-- <xs:simpleType name="accessControlOperation"> --> - <!-- <xs:annotation> --> - <!-- <xs:documentation>Shall be considered for access control policy check by the CSE</xs:documentation> --> - <!-- </xs:annotation> --> - <!-- <xs:restriction base="xs:integer"> --> - <!-- Create --> - <!-- <xs:enumeration value="1" /> --> - <!-- Retrieve --> - <!-- <xs:enumeration value="2" /> --> - <!-- Update --> - <!-- <xs:enumeration value="3" /> --> - <!-- Delete --> - <!-- <xs:enumeration value="4" /> --> - <!-- Notify --> - <!-- <xs:enumeration value="5" /> --> - <!-- Discover --> - <!-- <xs:enumeration value="6" /> --> - <!-- </xs:restriction> --> - <!-- </xs:simpleType> --> - - <!-- <xs:simpleType name="countryCode"> --> - <!-- <xs:annotation> --> - <!-- <xs:documentation>2-character country code </xs:documentation> --> - <!-- </xs:annotation> --> - <!-- <xs:restriction base="xs:integer"> --> - <!-- India --> - <!-- <xs:enumeration value="91" /> --> - <!-- United States of America --> - <!-- <xs:enumeration value="01" /> --> - <!-- </xs:restriction> --> - <!-- </xs:simpleType> --> - + <xs:simpleType name="accessControlOperation"> + <xs:annotation> + <xs:documentation>Shall be considered for access control policy check by the CSE</xs:documentation> + </xs:annotation> + <xs:restriction base="xs:integer"> + <!-- Create --> + <xs:enumeration value="1" /> + <!-- Retrieve --> + <xs:enumeration value="2" /> + <!-- Update --> + <xs:enumeration value="3" /> + <!-- Delete --> + <xs:enumeration value="4" /> + <!-- Notify --> + <xs:enumeration value="5" /> + <!-- Discover --> + <xs:enumeration value="6" /> + </xs:restriction> + </xs:simpleType> <xs:simpleType name="responseType"> <xs:annotation> @@ -730,7 +717,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:restriction> </xs:simpleType> - <!-- TODO: Agree representation of SRole-ID and add to TS-0004 --> + <!-- TODO: Agree representation of SRole-ID and add to TS-0004. Possibly consider removing all values --> <xs:simpleType name="SRole-ID"> <xs:restriction base="xs:token"> <!-- Software Management -->