Revert "From s3i210233"

TS33128Payloads

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

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

DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=

-- Relative OIDs

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

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

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

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

xCCPayloadOID               RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}

    geodeticInformation         [6] UTF8String OPTIONAL, 

    globalNGENbID               [7] GlobalRANNodeID OPTIONAL,

    cellSiteInformation         [8] CellSiteInformation OPTIONAL,

    globalENbID                 [9] GlobalRANNodeID OPTIONAL,

-- TS 38.413 [23], clause 9.3.1.16

    pSCellInfo                  [10] CellInformation OPTIONAL

    globalENbID                 [9] GlobalRANNodeID OPTIONAL

}

-- TS 29.571 [17], clause 5.4.4.9

    geographicalInformation     [5] UTF8String OPTIONAL,

    geodeticInformation         [6] UTF8String OPTIONAL, 

    globalGNbID                 [7] GlobalRANNodeID OPTIONAL,

    cellSiteInformation         [8] CellSiteInformation OPTIONAL,

-- TS 38.413 [23], clause 9.3.1.16

    pSCellInfo                  [10] CellInformation OPTIONAL

    cellSiteInformation         [8] CellSiteInformation OPTIONAL

}

-- TS 29.571 [17], clause 5.4.4.10

    tAI                         [1] TAI OPTIONAL,

    n3IWFID                     [2] N3IWFIDNGAP OPTIONAL, 

    uEIPAddr                    [3] IPAddr 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

    portNumber                  [4] INTEGER OPTIONAL

}

-- TS 38.413 [23], clause 9.3.2.4

    n3IWFID [1] N3IWFIDSBI,

    gNbID   [2] GNbID,

    nGENbID [3] NGENbID,

    eNbID   [4] ENbID,

    wAGFID  [5] WAGFID,

    tNGF    [6] TNGFID

    eNbID   [4] ENbID

}

-- TS 38.413 [23], clause 9.3.1.6

-- 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] CivicAddress OPTIONAL

}

-- TS 29.571 [17], clause 5.4.4.64

TWAPID ::= SEQUENCE

{

    sSID         [1] SSID OPTIONAL,

    bSSID        [2] BSSID OPTIONAL,

    civicAddress [3] CivicAddress 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

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))