Commit eb62ddea authored by canterburym's avatar canterburym
Browse files

Merge branch 'cr/33128/0495' into 'meeting/SA99' 

TS 33.128 CR0495 - Delegated State for LI_X1

See merge request !150
parents 5b9ef698 5da6d432

33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd

+25 −0
Original line number Diff line number Diff line
@@ -2,10 +2,12 @@ 
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"

           xmlns="urn:3GPP:ns:li:3GPPX1Extensions:r18:v2"

           xmlns:common="http://uri.etsi.org/03280/common/2017/07"

           xmlns:x1="http://uri.etsi.org/03221/X1/2017/10"

           targetNamespace="urn:3GPP:ns:li:3GPPX1Extensions:r18:v2"

           elementFormDefault="qualified">



  <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>

	<xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>



  <xs:element name="X1Extensions" type="X1Extension"></xs:element>
@@ -379,4 +381,27 @@ 
    </xs:sequence>

  </xs:complexType>



  <xs:element name="DelegatedTaskStatus" type="DelegatedTaskStatus"></xs:element>

    

  <xs:complexType name="DelegatedTaskStatus">

      <xs:sequence>

          <xs:element name="ListOfDelegatedTasks" type="ListOfDelegatedTasks"></xs:element>

      </xs:sequence>

  </xs:complexType>



  <xs:complexType name="ListOfDelegatedTasks">

      <xs:sequence>

          <xs:element name="DelegatedTask" type="DelegatedTask" minOccurs="0" maxOccurs="unbounded"></xs:element>

      </xs:sequence>

  </xs:complexType>

    

  <xs:complexType name="DelegatedTask">

    <xs:sequence>

        <xs:element name="NEID" type="x1:NeIdentifier"/>

        <xs:element name="TaskDetails" type="x1:TaskDetails"/>

        <xs:element name="TaskStatus" type="x1:TaskStatus" minOccurs="0"/>

        <xs:element name="LastTaskStatusTime" type="common:QualifiedMicrosecondDateTime" minOccurs="0"/>

    </xs:sequence>

  </xs:complexType>



</xs:schema>

testing/dependencies/xsd/TS_103_221_01_DestinationSet.xsd

0 → 100644
+40 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03221/X1/2017/10/DestinationSet" xmlns:x1="http://uri.etsi.org/03221/X1/2017/10" xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03221/X1/2017/10/DestinationSet" elementFormDefault="qualified" version="1.11.1">

	<xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>

	<xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>

	<!-- Message containers -->

	<xs:complexType name="DestinationSetDetails">

		<xs:complexContent>

			<xs:extension base="x1:GenericObject">

				<xs:sequence>

					<xs:element name="friendlyName" type="xs:string" minOccurs="0"/>

					<xs:element name="listOfAssociatedDIDs" type="ListOfAssociatedDIDs"/>

					<xs:element name="destinationSetDetailsExtension" type="DestinationSetDetailsExtension" minOccurs="0" maxOccurs="unbounded"/>

					<xs:element name="destinationSetType" type="DestinationSetType"/>

				</xs:sequence>

			</xs:extension>

		</xs:complexContent>

	</xs:complexType>

	<xs:complexType name="ListOfAssociatedDIDs">

		<xs:sequence>

			<xs:element name="AssociatedDID" type="AssociatedDID" minOccurs="0" maxOccurs="unbounded"/>

		</xs:sequence>

	</xs:complexType>

	<xs:complexType name="AssociatedDID">

		<xs:sequence>

			<xs:element name="dId" type="x1:DId"/>

			<xs:element name="preference" type="xs:integer"/>

		</xs:sequence>

	</xs:complexType>

	<xs:complexType name="DestinationSetDetailsExtension">

		<xs:complexContent>

			<xs:extension base="x1:Extension" />			

		</xs:complexContent>

	</xs:complexType>

	<xs:simpleType name="DestinationSetType">

		<xs:restriction base="xs:string">

			<xs:enumeration value="Redundant"/>

			<xs:enumeration value="Duplicate"/>

		</xs:restriction>

	</xs:simpleType>

</xs:schema>

testing/dependencies/xsd/TS_103_221_01_HashedID.xsd

0 → 100644
+35 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03221/X1/2017/10/HashedID" xmlns:x1="http://uri.etsi.org/03221/X1/2017/10" xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03221/X1/2017/10/HashedID" elementFormDefault="qualified" version="1.10.1">

	<xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>

	<xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>

	<!-- Message containers -->

	<xs:complexType name="HashContext">

		<xs:complexContent>

			<xs:extension base="x1:GenericObject">

				<xs:sequence>

					<xs:element name="hashAlgorithm" type="HashAlgorithm"/>

					<xs:element name="salt" type="Salt"/>

				</xs:sequence>

			</xs:extension>

		</xs:complexContent>

	</xs:complexType>

	<xs:simpleType name="HashAlgorithm">

		<xs:restriction base="xs:string">

			<xs:enumeration value="sha-256"/>

			<xs:enumeration value="sha-512"/>

			<xs:enumeration value="sha3-512"/>

		</xs:restriction>

	</xs:simpleType>

	<xs:simpleType name="Salt">

		<xs:restriction base="xs:hexBinary">

			<xs:minLength value="8"/>

		</xs:restriction>

	</xs:simpleType>

	<xs:complexType name="HashedIdentifier">

		<xs:sequence>

			<xs:element name="hashContextID" type="x1:GenericObjectID"/>

			<xs:element name="targetIdentityType" type="etsi103280:ShortString"/>

			<xs:element name="hashDigest" type="xs:hexBinary"/>

		</xs:sequence>

	</xs:complexType>

</xs:schema>

testing/dependencies/xsd/TS_103_221_01_v010801.xsd

deleted100644 → 0
+0 −790

File deleted.

Preview size limit exceeded, changes collapsed.

testing/dependencies/xsd/TS_103_221_01_v011401.xsd

0 → 100644
+1024 −0

File added.

Preview size limit exceeded, changes collapsed.