From 1b429a3d6f4e9056418bc07471f61b8d94e52c45 Mon Sep 17 00:00:00 2001 From: PeterNiblett <pdn3270@gmail.com> Date: Wed, 28 Jan 2015 19:30:39 +0000 Subject: [PATCH] Final CommonTypes tidyup --- CDT-accessControlPolicy-v0_8_0.xsd | 140 +---------------------------- CDT-commonTypes-v0_8_0.xsd | 125 ++++++++++++++++---------- CDT-enumerationTypes-v0_8_0.xsd | 135 ++++++++++++++++++++++++++++ 3 files changed, 213 insertions(+), 187 deletions(-) diff --git a/CDT-accessControlPolicy-v0_8_0.xsd b/CDT-accessControlPolicy-v0_8_0.xsd index 3f36c72..47184aa 100644 --- a/CDT-accessControlPolicy-v0_8_0.xsd +++ b/CDT-accessControlPolicy-v0_8_0.xsd @@ -74,9 +74,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:complexType> </xs:element> - <!-- TODO: 1) final decision: Should some or all of the data types defined below go into CDT-Common Types - (and "m2m:accessControlOperations" into CDT-Enumerations) ? - 2) define short names for "setOfAcrs" and all its elements names (CR to TS-0004 for next PRO WG meeting) --> + <!-- TODO: define short names for "setOfAcrs" and all its elements names (CR to TS-0004 for next PRO WG meeting) --> <xs:complexType name="setOfAcrs"> <xs:sequence> @@ -218,140 +216,4 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:restriction> </xs:simpleType> - <!-- access control operations --> - <xs:simpleType name="accessControlOperations"> - <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"/> - <!-- Create + Retrieve --> - <xs:enumeration value="3"/> - <!-- Update --> - <xs:enumeration value="4"/> - <!-- Create + Update --> - <xs:enumeration value="5"/> - <!-- Retrieve + Update --> - <xs:enumeration value="6"/> - <!-- Create + Retrieve + Update --> - <xs:enumeration value="7"/> - <!-- Delete --> - <xs:enumeration value="8"/> - <!-- Create + Delete --> - <xs:enumeration value="9"/> - <!-- Retrieve + Delete --> - <xs:enumeration value="10"/> - <!-- Create + Retrieve + Delete --> - <xs:enumeration value="11"/> - <!-- Update + Delete --> - <xs:enumeration value="12"/> - <!-- Create + Update + Delete --> - <xs:enumeration value="13"/> - <!-- Retrieve + Update + Delete --> - <xs:enumeration value="14"/> - <!-- Create + Retrieve + Update + Delete --> - <xs:enumeration value="15"/> - <!-- Notify --> - <xs:enumeration value="16"/> - <!-- Create + Notify --> - <xs:enumeration value="17"/> - <!-- Retrieve + Notify --> - <xs:enumeration value="18"/> - <!-- Create + Retrieve + Notify --> - <xs:enumeration value="19"/> - <!-- Update + Notify --> - <xs:enumeration value="20"/> - <!-- Create + Update + Notify --> - <xs:enumeration value="21"/> - <!-- Retrieve + Update + Notify --> - <xs:enumeration value="22"/> - <!-- Create + Retrieve + Update --> - <xs:enumeration value="23"/> - <!-- Delete + Notify --> - <xs:enumeration value="24"/> - <!-- Create + Delete + Notify --> - <xs:enumeration value="25"/> - <!-- Retrieve + Delete + Notify --> - <xs:enumeration value="26"/> - <!-- Create + Retrieve + Delete + Notify --> - <xs:enumeration value="27"/> - <!-- Update + Delete + Notify --> - <xs:enumeration value="28"/> - <!-- Create + Update + Delete + Notify --> - <xs:enumeration value="29"/> - <!-- Retrieve + Update + Delete + Notify --> - <xs:enumeration value="30"/> - <!-- Create + Retrieve + Update + Delete + Notify --> - <xs:enumeration value="31"/> - <!-- Discover --> - <xs:enumeration value="32"/> - <!-- Create + Discover --> - <xs:enumeration value="33"/> - <!-- Retrieve + Discover --> - <xs:enumeration value="34"/> - <!-- Create + Retrieve + Discover --> - <xs:enumeration value="35"/> - <!-- Update + Discover --> - <xs:enumeration value="36"/> - <!-- Create + Update + Discover --> - <xs:enumeration value="37"/> - <!-- Retrieve + Update + Discover --> - <xs:enumeration value="38"/> - <!-- Create + Retrieve + Update + Discover --> - <xs:enumeration value="39"/> - <!-- Delete + Discover --> - <xs:enumeration value="40"/> - <!-- Create + Delete + Discover --> - <xs:enumeration value="41"/> - <!-- Retrieve + Delete + Discover --> - <xs:enumeration value="42"/> - <!-- Create + Retrieve + Delete + Discover --> - <xs:enumeration value="43"/> - <!-- Update + Delete + Discover --> - <xs:enumeration value="44"/> - <!-- Create + Update + Delete + Discover --> - <xs:enumeration value="45"/> - <!-- Retrieve + Update + Delete + Discover --> - <xs:enumeration value="46"/> - <!-- Create + Retrieve + Update + Delete + Discover --> - <xs:enumeration value="47"/> - <!-- Notify + Discover --> - <xs:enumeration value="48"/> - <!-- Create + Notify + Discover --> - <xs:enumeration value="49"/> - <!-- Retrieve + Notify + Discover --> - <xs:enumeration value="50"/> - <!-- Create + Retrieve + Notify + Discover --> - <xs:enumeration value="51"/> - <!-- Update + Notify + Discover --> - <xs:enumeration value="52"/> - <!-- Create + Update + Notify + Discover --> - <xs:enumeration value="53"/> - <!-- Retrieve + Update + Notify + Discover --> - <xs:enumeration value="54"/> - <!-- Create + Retrieve + Update + Discover --> - <xs:enumeration value="55"/> - <!-- Delete + Notify + Discover --> - <xs:enumeration value="56"/> - <!-- Create + Delete + Notify + Discover --> - <xs:enumeration value="57"/> - <!-- Retrieve + Delete + Notify + Discover --> - <xs:enumeration value="58"/> - <!-- Create + Retrieve + Delete + Notify + Discover --> - <xs:enumeration value="59"/> - <!-- Update + Delete + Notify + Discover --> - <xs:enumeration value="60"/> - <!-- Create + Update + Delete + Notify + Discover --> - <xs:enumeration value="61"/> - <!-- Retrieve + Update + Delete + Notify + Discover --> - <xs:enumeration value="62"/> - <!-- Create + Retrieve + Update + Delete + Notify + Discover --> - <xs:enumeration value="63"/> - </xs:restriction> - </xs:simpleType> - </xs:schema> diff --git a/CDT-commonTypes-v0_8_0.xsd b/CDT-commonTypes-v0_8_0.xsd index 1b37904..ba3ec7a 100644 --- a/CDT-commonTypes-v0_8_0.xsd +++ b/CDT-commonTypes-v0_8_0.xsd @@ -32,13 +32,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <!--********************** --> <xs:simpleType name="ID"> - <xs:restriction base="xs:anyURI"> - </xs:restriction> + <xs:restriction base="xs:anyURI" /> </xs:simpleType> <xs:simpleType name="nodeID"> - <xs:restriction base="xs:token"> - </xs:restriction> + <xs:restriction base="xs:token" /> </xs:simpleType> <xs:simpleType name="deviceID"> @@ -51,16 +49,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:restriction> </xs:simpleType> - <xs:complexType name="externalID"> - <xs:simpleContent> - <xs:extension base="xs:anyURI"> - </xs:extension> - </xs:simpleContent> - </xs:complexType> + <xs:simpleType name="externalID"> + <xs:restriction base="xs:token" /> + </xs:simpleType> <xs:simpleType name="requestID"> - <xs:restriction base="xs:token"> - </xs:restriction> + <xs:restriction base="xs:token" /> </xs:simpleType> <xs:simpleType name="nhURI"> @@ -71,36 +65,21 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <list itemType="xs:anyURI" /> </xs:simpleType> + <!-- TODO: "labels" is called "labelsType" in Table 6.3.2-1 --> <xs:simpleType name="labels"> <xs:list itemType="xs:token" /> </xs:simpleType> - <!-- TODO: this data type is not used in any of the XSD files. It is listed in TS-004 without any given use case --> + <!-- TODO: this data type is not used in any of the XSD files. It is listed in TS-0004 without any given use case --> <xs:simpleType name="networkaccessID"> <xs:restriction base="xs:token"> </xs:restriction> </xs:simpleType> - <!-- "listOfM2MID" is a space separated list of CSE-IDs and/or AE-IDs (i.e. elements of data type m2m:ID" --> + <!-- "listOfM2MID" is a space separated list of CSE-IDs and/or AE-IDs (i.e. elements of data type m2m:ID") --> <xs:simpleType name="listOfM2MID"> <xs:list itemType="m2m:ID" /> </xs:simpleType> - - <xs:simpleType name="eventCat"> - <xs:union memberTypes="m2m:stdEventCats " /> - </xs:simpleType> - - <xs:simpleType name="eventCatWithDef"> - <xs:union memberTypes="m2m:eventCat " /> - </xs:simpleType> - - <xs:simpleType name="listOfEventCat"> - <list itemType="m2m:eventCat" /> - </xs:simpleType> - - <xs:simpleType name="listOfEventCatWithDef"> - <list itemType="m2m:eventCatWithDef" /> - </xs:simpleType> <!-- auxiliary data type required to define "listOflongMin-1" below --> <xs:simpleType name="longMin-1"> @@ -122,21 +101,21 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:restriction> </xs:simpleType> - <!-- auxiliary data type required to define "listOfMinMax" below --> + <!-- auxiliary data type required to define "backOffParameters" below --> <xs:simpleType name="listOfNonNegInt"> <xs:list itemType="xs:nonNegativeInteger" /> </xs:simpleType> <!-- "backOffParameters" is an ordered list of 3 nonNegativeInteger numbers: backoffTime, backoffTimeIncrement, maximumBackoffTime (in that order!), all units in milliseconds --> + <xs:simpleType name="backOffParameters"> <xs:restriction base="m2m:listOfNonNegInt"> - <xs:minLength value="3" /> - <xs:maxLength value="3" /> + <xs:length value="3" /> </xs:restriction> </xs:simpleType> - <!-- m2m:ipv4 and m2m:ipv6 are defined in the CDT-accessControlPolicy file --> + <!-- m2m:ipv4 and m2m:ipv6 and m2m:countryCode are defined in the CDT-accessControlPolicy file --> <xs:simpleType name="pOAList"> <xs:list itemType="xs:string" /> @@ -155,12 +134,49 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:restriction> </xs:simpleType> - <xs:simpleType name="contentInfo"> <xs:restriction base="xs:string"> <xs:pattern value="[\w/!#$^_.+&\-]+(:[0-2])?" /> </xs:restriction> </xs:simpleType> + + <xs:simpleType name="eventCat"> + <union> + <simpleType> + <restriction base='m2m:stdEventCats' /> + </simpleType> + <!-- User-defined range --> + <simpleType> + <restriction base='xs:integer'> + <xs:minInclusive value="100" /> + <xs:maxInclusive value="999" /> + </restriction> + </simpleType> + </union> + </xs:simpleType> + + <xs:simpleType name="eventCatWithDef"> + <union> + <simpleType> + <restriction base='m2m:eventCat' /> + </simpleType> + <!-- User-defined range --> + <simpleType> + <restriction base='xs:integer'> + <xs:enumeration value="0" /> + </restriction> + </simpleType> + </union> + </xs:simpleType> + + <!-- TODO: listOfEventCat appears twice in Table 6.3.2-1 --> + <xs:simpleType name="listOfEventCat"> + <list itemType="m2m:eventCat" /> + </xs:simpleType> + + <xs:simpleType name="listOfEventCatWithDef"> + <list itemType="m2m:eventCatWithDef" /> + </xs:simpleType> <xs:simpleType name="scheduleEntry"> <xs:restriction base="xs:string"> @@ -169,6 +185,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:restriction> </xs:simpleType> + <!-- TODO: triggerRecipientID is not in Table 6.3.2-1 --> <xs:simpleType name="triggerRecipientID"> <xs:restriction base="xs:unsignedInt" /> </xs:simpleType> @@ -232,7 +249,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element name="groupRequestIdentifier" type="xs:string" minOccurs="0" /> <xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0" /> <xs:element name="discoveryResultType" type="m2m:discResType" minOccurs="0" /> - <xs:element name="role" type="xs:string" minOccurs="0" /> </xs:sequence> </xs:complexType> @@ -241,6 +257,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:any namespace="http://www.onem2m.org/xml/protocols" processContents="lax" minOccurs="0" maxOccurs="unbounded" /> </xs:sequence> </xs:complexType> + + <!-- m2m:batchNotify and m2m:eventNotificationCriteria are defined in the subscription resource file --> <xs:complexType name="filterCriteria"> <xs:sequence> @@ -263,7 +281,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:sequence> </xs:complexType> - + <!-- TODO: The format for attribute shown in clause 6.3.4 cannot take complex content, so it is done differently here --> <xs:complexType name="attribute"> <xs:sequence> <xs:element name="name" type="xs:NCName" /> @@ -282,6 +300,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element name="scheduleEntry" type="m2m:scheduleEntry" maxOccurs="unbounded" /> </xs:sequence> </xs:complexType> + + <!-- m2m:aggregatedNotification and m2m:Notification are in the Notification xsd file --> <!-- "actionStatus" is used across mgmtObj resources --> <xs:complexType name="actionStatus"> @@ -332,8 +352,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element name="targetFile" type="xs:string" /> <xs:element name="delaySeconds" type="xs:int" /> <xs:element name="successURL" type="xs:anyURI" /> - <xs:element name="startTime" type="xs:dateTime" /> - <xs:element name="completeTime" type="xs:dateTime" /> + <xs:element name="startTime" type="m2m:timestamp" /> + <xs:element name="completeTime" type="m2m:timestamp" /> <xs:element name="anyArg" type="m2m:anyArgType" minOccurs="0" maxOccurs="unbounded" /> </xs:sequence> </xs:complexType> @@ -384,10 +404,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:choice> </xs:complexType> + <!-- TODO: - TS-0004 gives the datatype of name as xs:string --> <xs:complexType name="mgmtLinkRef"> <xs:simpleContent> <xs:extension base="xs:anyURI"> - <xs:attribute name="name" type="xs:string" use="required" /> + <xs:attribute name="name" type="xs:NCName" use="required" /> <xs:attribute name="type" type="m2m:mgmtDefinition" use="required" /> </xs:extension> </xs:simpleContent> @@ -401,17 +422,25 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:complexContent> </xs:complexType> + <!-- m2m:accessControlRule and m2m:locationRegion are defined in the accessControlPolicy xsd file --> + <!-- TODO: - TS-0004 gives the datatype of name as xs:string --> <xs:complexType name="childResourceRef"> <xs:simpleContent> <xs:extension base="xs:anyURI"> - <xs:attribute name="resourceName" type="xs:string" use="required" /> + <xs:attribute name="resourceName" type="xs:NCName" use="required" /> <xs:attribute name="type" type="m2m:resourceType" use="required" /> </xs:extension> </xs:simpleContent> </xs:complexType> - + <!-- TODO: - This is in TS-0004 but is not used by any other schema --> + <xs:complexType name="responseTypeInfo"> + <xs:sequence> + <xs:element name="responseType" type="m2m:responseType" /> + <xs:element name="notificationURI" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded" /> + </xs:sequence> + </xs:complexType> <!-- TODO: order of elements should be aligned with the one in responsePrimitive --> <xs:complexType name="operationResult"> @@ -437,8 +466,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element name="resourceType" type="m2m:resourceType" /> <xs:element name="resourceID" type="m2m:ID" /> <xs:element name="parentID" type="m2m:nhURI" /> - <xs:element name="creationTime" type="xs:dateTime" /> - <xs:element name="lastModifiedTime" type="xs:dateTime" /> + <xs:element name="creationTime" type="m2m:timestamp" /> + <xs:element name="lastModifiedTime" type="m2m:timestamp" /> <xs:element name="labels" type="m2m:labels" minOccurs="0" /> </xs:sequence> <xs:attribute name="name" type="xs:token" use="required" /> @@ -449,7 +478,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:extension base="m2m:resource"> <xs:sequence> <xs:element name="accessControlPolicyIDs" type="m2m:acpType" minOccurs="0" /> - <xs:element name="expirationTime" type="xs:dateTime" /> + <xs:element name="expirationTime" type="m2m:timestamp" /> </xs:sequence> </xs:extension> </xs:complexContent> @@ -476,7 +505,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:extension base="m2m:resource"> <xs:sequence> <xs:element name="accessControlPolicyIDs" type="m2m:acpType" /> - <xs:element name="expirationTime" type="xs:dateTime" /> + <xs:element name="expirationTime" type="m2m:timestamp" /> <xs:element name="link" type="xs:anyURI" /> </xs:sequence> </xs:extension> @@ -487,7 +516,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:complexContent> <xs:extension base="m2m:resource"> <xs:sequence> - <xs:element name="expirationTime" type="xs:dateTime" /> + <xs:element name="expirationTime" type="m2m:timestamp" /> <xs:element name="announceTo" type="m2m:listOfURIs" minOccurs="0" /> <xs:element name="announcedAttribute" minOccurs="0"> <xs:simpleType> @@ -503,7 +532,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:complexContent> <xs:extension base="m2m:resource"> <xs:sequence> - <xs:element name="expirationTime" type="xs:dateTime" /> + <xs:element name="expirationTime" type="m2m:timestamp" /> <xs:element name="link" type="xs:anyURI" /> </xs:sequence> </xs:extension> diff --git a/CDT-enumerationTypes-v0_8_0.xsd b/CDT-enumerationTypes-v0_8_0.xsd index 5968d1d..5127f71 100644 --- a/CDT-enumerationTypes-v0_8_0.xsd +++ b/CDT-enumerationTypes-v0_8_0.xsd @@ -718,6 +718,141 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:restriction> </xs:simpleType> + <!-- access control operations --> + <xs:simpleType name="accessControlOperations"> + <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"/> + <!-- Create + Retrieve --> + <xs:enumeration value="3"/> + <!-- Update --> + <xs:enumeration value="4"/> + <!-- Create + Update --> + <xs:enumeration value="5"/> + <!-- Retrieve + Update --> + <xs:enumeration value="6"/> + <!-- Create + Retrieve + Update --> + <xs:enumeration value="7"/> + <!-- Delete --> + <xs:enumeration value="8"/> + <!-- Create + Delete --> + <xs:enumeration value="9"/> + <!-- Retrieve + Delete --> + <xs:enumeration value="10"/> + <!-- Create + Retrieve + Delete --> + <xs:enumeration value="11"/> + <!-- Update + Delete --> + <xs:enumeration value="12"/> + <!-- Create + Update + Delete --> + <xs:enumeration value="13"/> + <!-- Retrieve + Update + Delete --> + <xs:enumeration value="14"/> + <!-- Create + Retrieve + Update + Delete --> + <xs:enumeration value="15"/> + <!-- Notify --> + <xs:enumeration value="16"/> + <!-- Create + Notify --> + <xs:enumeration value="17"/> + <!-- Retrieve + Notify --> + <xs:enumeration value="18"/> + <!-- Create + Retrieve + Notify --> + <xs:enumeration value="19"/> + <!-- Update + Notify --> + <xs:enumeration value="20"/> + <!-- Create + Update + Notify --> + <xs:enumeration value="21"/> + <!-- Retrieve + Update + Notify --> + <xs:enumeration value="22"/> + <!-- Create + Retrieve + Update --> + <xs:enumeration value="23"/> + <!-- Delete + Notify --> + <xs:enumeration value="24"/> + <!-- Create + Delete + Notify --> + <xs:enumeration value="25"/> + <!-- Retrieve + Delete + Notify --> + <xs:enumeration value="26"/> + <!-- Create + Retrieve + Delete + Notify --> + <xs:enumeration value="27"/> + <!-- Update + Delete + Notify --> + <xs:enumeration value="28"/> + <!-- Create + Update + Delete + Notify --> + <xs:enumeration value="29"/> + <!-- Retrieve + Update + Delete + Notify --> + <xs:enumeration value="30"/> + <!-- Create + Retrieve + Update + Delete + Notify --> + <xs:enumeration value="31"/> + <!-- Discover --> + <xs:enumeration value="32"/> + <!-- Create + Discover --> + <xs:enumeration value="33"/> + <!-- Retrieve + Discover --> + <xs:enumeration value="34"/> + <!-- Create + Retrieve + Discover --> + <xs:enumeration value="35"/> + <!-- Update + Discover --> + <xs:enumeration value="36"/> + <!-- Create + Update + Discover --> + <xs:enumeration value="37"/> + <!-- Retrieve + Update + Discover --> + <xs:enumeration value="38"/> + <!-- Create + Retrieve + Update + Discover --> + <xs:enumeration value="39"/> + <!-- Delete + Discover --> + <xs:enumeration value="40"/> + <!-- Create + Delete + Discover --> + <xs:enumeration value="41"/> + <!-- Retrieve + Delete + Discover --> + <xs:enumeration value="42"/> + <!-- Create + Retrieve + Delete + Discover --> + <xs:enumeration value="43"/> + <!-- Update + Delete + Discover --> + <xs:enumeration value="44"/> + <!-- Create + Update + Delete + Discover --> + <xs:enumeration value="45"/> + <!-- Retrieve + Update + Delete + Discover --> + <xs:enumeration value="46"/> + <!-- Create + Retrieve + Update + Delete + Discover --> + <xs:enumeration value="47"/> + <!-- Notify + Discover --> + <xs:enumeration value="48"/> + <!-- Create + Notify + Discover --> + <xs:enumeration value="49"/> + <!-- Retrieve + Notify + Discover --> + <xs:enumeration value="50"/> + <!-- Create + Retrieve + Notify + Discover --> + <xs:enumeration value="51"/> + <!-- Update + Notify + Discover --> + <xs:enumeration value="52"/> + <!-- Create + Update + Notify + Discover --> + <xs:enumeration value="53"/> + <!-- Retrieve + Update + Notify + Discover --> + <xs:enumeration value="54"/> + <!-- Create + Retrieve + Update + Discover --> + <xs:enumeration value="55"/> + <!-- Delete + Notify + Discover --> + <xs:enumeration value="56"/> + <!-- Create + Delete + Notify + Discover --> + <xs:enumeration value="57"/> + <!-- Retrieve + Delete + Notify + Discover --> + <xs:enumeration value="58"/> + <!-- Create + Retrieve + Delete + Notify + Discover --> + <xs:enumeration value="59"/> + <!-- Update + Delete + Notify + Discover --> + <xs:enumeration value="60"/> + <!-- Create + Update + Delete + Notify + Discover --> + <xs:enumeration value="61"/> + <!-- Retrieve + Update + Delete + Notify + Discover --> + <xs:enumeration value="62"/> + <!-- Create + Retrieve + Update + Delete + Notify + Discover --> + <xs:enumeration value="63"/> + </xs:restriction> + </xs:simpleType> + <xs:simpleType name="SRole-ID"> <xs:restriction base="xs:token"> <!-- Software Management --> -- GitLab