Commit 55e3c5aa authored by canterburym's avatar canterburym
Browse files

Merge branch 'test_merge' into 'meeting/LI81ea' 

Test merge

See merge request !77
parents 15dc994b 77d91afe

33128/r16/TS33128Payloads.asn

+112 −52
Original line number Diff line number Diff line 
TS33128Payloads

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r16(16) version5(5)}

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r16(16) version6(6)}



DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=
@@ -9,7 +9,7 @@ BEGIN 
-- Relative OIDs

-- =============



tS33128PayloadsOID          RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version5(5)}

tS33128PayloadsOID          RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version6(6)}



xIRIPayloadOID              RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)}

xCCPayloadOID               RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
@@ -1906,9 +1906,12 @@ PTCAccessPolicyFailure ::= ENUMERATED 
LALSReport ::= SEQUENCE

{

    sUPI                [1] SUPI OPTIONAL,

    pEI                 [2] PEI OPTIONAL,

 -- pEI                 [2] PEI OPTIONAL, deprecated in Release-16, do not re-use this tag number

    gPSI                [3] GPSI OPTIONAL,

    location            [4] Location OPTIONAL

    location            [4] Location OPTIONAL,

    iMPU                [5] IMPU OPTIONAL,

    iMSI                [7] IMSI OPTIONAL,

    mSISDN              [8] MSISDN OPTIONAL

}



-- =====================
@@ -2381,7 +2384,13 @@ N3GALocation ::= SEQUENCE 
    tAI                         [1] TAI OPTIONAL,

    n3IWFID                     [2] N3IWFIDNGAP OPTIONAL,

    uEIPAddr                    [3] IPAddr OPTIONAL,

    portNumber                  [4] INTEGER OPTIONAL

    portNumber                  [4] INTEGER OPTIONAL,

    tNAPID                      [5] TNAPID OPTIONAL,

    tWAPID                      [6] TWAPID OPTIONAL,

    hFCNodeID                   [7] HFCNodeID OPTIONAL,

    gLI                         [8] GLI OPTIONAL,

    w5GBANLineType              [9] W5GBANLineType OPTIONAL,

    gCI                         [10] GCI OPTIONAL

}



-- TS 38.413 [23], clause 9.3.2.4
@@ -2404,7 +2413,9 @@ ANNodeID ::= CHOICE 
    n3IWFID [1] N3IWFIDSBI,

    gNbID   [2] GNbID,

    nGENbID [3] NGENbID,

    eNbID   [4] ENbID

    eNbID   [4] ENbID,

    wAGFID  [5] WAGFID,

    tNGFID  [6] TNGFID

}



-- TS 38.413 [23], clause 9.3.1.6
@@ -2455,6 +2466,51 @@ N3IWFIDNGAP ::= BIT STRING (SIZE(16)) 
-- TS 29.571 [17], clause 5.4.4.28

N3IWFIDSBI ::= UTF8String



-- TS 29.571 [17], clause 5.4.4.28 and table 5.4.2-1

TNGFID ::= UTF8String



-- TS 29.571 [17], clause 5.4.4.28 and table 5.4.2-1

WAGFID ::= UTF8String



-- TS 29.571 [17], clause 5.4.4.62

TNAPID ::= SEQUENCE

{

    sSID         [1] SSID OPTIONAL,

    bSSID        [2] BSSID OPTIONAL,

    civicAddress [3] CivicAddressBytes OPTIONAL

}



-- TS 29.571 [17], clause 5.4.4.64

TWAPID ::= SEQUENCE

{

    sSID         [1] SSID OPTIONAL,

    bSSID        [2] BSSID OPTIONAL,

    civicAddress [3] CivicAddressBytes OPTIONAL

}



-- TS 29.571 [17], clause 5.4.4.62 and clause 5.4.4.64

SSID ::= UTF8String



-- TS 29.571 [17], clause 5.4.4.62 and clause 5.4.4.64

BSSID ::= UTF8String



-- TS 29.571 [17], clause 5.4.4.36 and table 5.4.2-1

HFCNodeID ::= UTF8String



-- TS 29.571 [17], clause 5.4.4.10 and table 5.4.2-1

-- Contains the original binary data i.e. value of the YAML field after base64 encoding is removed

GLI ::= OCTET STRING (SIZE(0..150))



-- TS 29.571 [17], clause 5.4.4.10 and table 5.4.2-1

GCI ::= UTF8String



-- TS 29.571 [17], clause 5.4.4.10 and clause 5.4.3.33

W5GBANLineType ::= ENUMERATED

{

    dSL(1),

    pON(2)

}



-- TS 29.571 [17], table 5.4.2-1

TAC ::= OCTET STRING (SIZE(2..3))
@@ -2674,6 +2730,10 @@ CivicAddress ::= SEQUENCE 
    pom                                 [31] UTF8String OPTIONAL

}



-- TS 29.571 [17], clauses 5.4.4.62 and 5.4.4.64

-- Contains the original binary data i.e. value of the YAML field after base64 encoding is removed

CivicAddressBytes ::= OCTET STRING



-- TS 29.572 [24], clause 6.1.6.2.15

PositioningMethodAndUsage ::= SEQUENCE

{

33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd

+107 −4
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:3GPPIdentityExtensions:r16:v2"

           xmlns="urn:3GPP:ns:li:3GPPIdentityExtensions:r16:v3"

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

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

           targetNamespace="urn:3GPP:ns:li:3GPPIdentityExtensions:r16:v2"

           targetNamespace="urn:3GPP:ns:li:3GPPIdentityExtensions:r16:v3"

           elementFormDefault="qualified">



  <xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>
@@ -87,6 +87,7 @@ 
      <xs:element name="PEI" type="PEI" minOccurs="0"/>

      <xs:element name="AssociationStartTime" type="common:QualifiedMicrosecondDateTime"/>

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

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

    </xs:sequence>

  </xs:complexType>
@@ -113,4 +114,106 @@ 
    </xs:choice>

  </xs:complexType>



  <xs:complexType name="FiveGSTAIList">

    <xs:sequence>

      <xs:element name="FiveGSTAI" type="FiveGSTAI" maxOccurs="unbounded"/>

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="FiveGSTAI">

    <xs:sequence>

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

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

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

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

    </xs:sequence>

  </xs:complexType>



  <xs:simpleType name="MCC">

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

      <xs:pattern value="[0-9]{3}"></xs:pattern>

    </xs:restriction>

  </xs:simpleType>



  <xs:simpleType name="MNC">

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

      <xs:pattern value="[0-9]{2,3}"></xs:pattern>

    </xs:restriction>

  </xs:simpleType>



  <xs:simpleType name="TAC">

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

      <xs:pattern value="[A-Fa-f0-9]{4}"></xs:pattern>

    </xs:restriction>

  </xs:simpleType>



  <xs:simpleType name="NID">

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

      <xs:pattern value="[A-Fa-f0-9]{11}"></xs:pattern>

    </xs:restriction>

  </xs:simpleType>



  <xs:complexType name="ActivateAssociationUpdates">

    <xs:complexContent>

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

        <xs:sequence>

          <xs:element name="OngoingAssociationTaskID" type="common:UUID"></xs:element>

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

        </xs:sequence>

      </xs:extension>

    </xs:complexContent>

  </xs:complexType>



  <xs:complexType name="ActivateAssociationUpdatesAcknowledgement">

    <xs:complexContent>

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

        <xs:sequence>

          <xs:element name="oK" type="x1:OKAckAndComplete"/>

          <xs:element name="CurrentAssociations" type="IdentityResponseDetails"></xs:element>

        </xs:sequence>

      </xs:extension>

    </xs:complexContent>

  </xs:complexType>



  <xs:complexType name="DeactivateAssociationUpdates">

    <xs:complexContent>

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

        <xs:sequence>

          <xs:element name="OngoingAssociationTaskID" type="common:UUID"></xs:element>

        </xs:sequence>

      </xs:extension>

    </xs:complexContent>

  </xs:complexType>



  <xs:complexType name="DeactivateAssociationUpdatesAcknowledgement">

    <xs:complexContent>

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

        <xs:sequence>

          <xs:element name="oK" type="x1:OKAckAndComplete"/>

        </xs:sequence>

      </xs:extension>

    </xs:complexContent>

  </xs:complexType>



  <xs:complexType name="IdentityAssociationUpdate">

    <xs:complexContent>

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

        <xs:sequence>

          <xs:element name="OngoingAssociationTaskID" type="common:UUID"/>

          <xs:element name="UpdateDetails" type="IdentityResponseDetails"/>

        </xs:sequence>

      </xs:extension>

    </xs:complexContent>

  </xs:complexType>



  <xs:complexType name="IdentityAssociationUpdateAcknowledgement">

    <xs:complexContent>

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

        <xs:sequence>

          <xs:element name="oK" type="x1:OKAckAndComplete"/>

        </xs:sequence>

      </xs:extension>

    </xs:complexContent>

  </xs:complexType>



</xs:schema>
 
 No newline at end of file

33128/r16/urn_3GPP_ns_li_3GPPStateTransfer.xsd

0 → 100644
+50 −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:etsiX1="http://uri.etsi.org/03221/X1/2017/10"

           xmlns="urn:3GPP:ns:li:3GPPStateTransfer:r16:v1"

           targetNamespace="urn:3GPP:ns:li:3GPPStateTransfer:r16:v1"

           elementFormDefault="qualified">



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



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

  <xs:complexType name="TFLIState">

    <xs:sequence>

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

      <xs:element name="XID" type="etsiX1:XId"></xs:element>

      <xs:element name="CorrelationID" type="xs:nonNegativeInteger"></xs:element>

      <xs:element name="TriggeredTasks" type="ListOfTriggeredTasks"></xs:element>

    </xs:sequence>

  </xs:complexType>



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

  <xs:complexType name="POILIState">

    <xs:sequence>

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

      <xs:element name="XID" type="etsiX1:XId"></xs:element>

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

      <xs:element name="CorrelationID" type="xs:nonNegativeInteger"></xs:element>

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="ListOfTriggeredTasks">

    <xs:sequence>

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

    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="TriggeredTask">

    <xs:sequence>

      <xs:element name="XID" type="etsiX1:XId"></xs:element>

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

    </xs:sequence>

  </xs:complexType>



  <xs:simpleType name="PDUSessionID">

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

      <xs:minInclusive value="0"/>

      <xs:maxInclusive value="255"/>

    </xs:restriction>

  </xs:simpleType>



</xs:schema>
 
 No newline at end of file

33128/r16/urn_3GPP_ns_li_3GPPX1Extensions.xsd

+6 −5
Original line number Diff line number Diff line
@@ -245,4 +245,5 @@ 
  </xs:simpleType>



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



</xs:schema>
 
 No newline at end of file

33128/r17/TS33128Payloads.asn

+918 −69

File changed.

Preview size limit exceeded, changes collapsed.