Commit d3c2957f authored by canterburym's avatar canterburym
Browse files

Fixed merge conflict

parents 4c8fb7fa 441a3c2c

33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd

+42 −16
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="urn:3GPP:ns:li:3GPPX1Extensions:r17:v1"

<<<<<<< HEAD

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

           targetNamespace="urn:3GPP:ns:li:3GPPX1Extensions:r17:v1"

           elementFormDefault="qualified">



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

  

=======

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

           targetNamespace="urn:3GPP:ns:li:3GPPX1Extensions:r17:v1"

           elementFormDefault="qualified">



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



>>>>>>> ecfb079f258c2141e556b6c98c545ab63e2a6e2a

  <xs:element name="X1Extensions" type="X1Extension"></xs:element>

  <xs:complexType name="X1Extensions">

    <xs:sequence>
@@ -71,16 +62,16 @@ 
  <xs:complexType name="FSEID">

    <xs:sequence>

      <xs:element name="SEID" type="xs:unsignedLong"></xs:element>

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

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

      <xs:element name="IPv4Address" type="etsi103280IPv4Address" minOccurs="0"></xs:element>

      <xs:element name="IPv6Address" type="etsi103280IPv6Address" minOccurs="0"></xs:element>

   </xs:sequence>

  </xs:complexType>



  <xs:complexType name="FTEID">

    <xs:sequence>

      <xs:element name="TEID" type="xs:unsignedInt"></xs:element>

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

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

      <xs:element name="IPv4Address" type="etsi103280IPv4Address" minOccurs="0"></xs:element>

      <xs:element name="IPv6Address" type="etsi103280IPv6Address" minOccurs="0"></xs:element>

   </xs:sequence>

  </xs:complexType>
@@ -187,8 +178,8 @@ 
  <xs:complexType name="LILCSClientIPAddress">

    <xs:sequence>

      <xs:choice>

        <xs:element name="IPv4Address" type="common:IPv4Address"/>

        <xs:element name="IPv6Address" type="common:IPv6Address"/>

        <xs:element name="IPv4Address" type="etsi103280IPv4Address"/>

        <xs:element name="IPv6Address" type="etsi103280IPv6Address"/>

      </xs:choice>

    </xs:sequence>

  </xs:complexType>
@@ -252,4 +243,39 @@ 
      <xs:element name="AKID" type="etsi103280:NAI"></xs:element>

    </xs:choice>

  </xs:complexType>  



  <xs:element name="HR" type="EmptyElement"></xs:element>

  <xs:element name="IMSSignaling" type="EmptyElement"></xs:element>



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



  <xs:complexType name="HRLIT1TargetIdentifierExtensions">

    <xs:sequence>

      <xs:element name="HRLIT1TargetIdentifier" type="HRLIT1TargetIdentifier" minOccurs="1" maxOccurs="unbounded"></xs:element>

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="HRLIT1TargetIdentifier">

    <xs:choice>

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

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

      <xs:element name="IMSVoiceMedia" type="EmptyElement"></xs:element>

    </xs:choice>

  </xs:complexType>



  <xs:simpleType name="PDUSessionID">

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

      <xs:minInclusive value="0"/>

      <xs:maxInclusive value="255"/>

    </xs:restriction>

  </xs:simpleType>



  <xs:simpleType name="BearerID">

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

      <xs:minInclusive value="0"/>

      <xs:maxInclusive value="255"/>

    </xs:restriction>

  </xs:simpleType>





</xs:schema>