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
Pipeline #4137 passed with stages
in 1 minute and 26 seconds
......@@ -141,7 +141,7 @@ LINotificationPayload ::= SEQUENCE
LINotificationMessage ::= CHOICE
{
lINotification [1] LINotification
lINotification [1] LINotification
}
-- ==================
......@@ -413,7 +413,7 @@ QFI ::= INTEGER (0..63)
-- 5G UDM definitions
-- ==================
UDMServingSystemMessage ::= SEQUENCE
UDMServingSystemMessage ::= SEQUENCE
{
sUPI [1] SUPI,
pEI [2] PEI OPTIONAL,
......@@ -512,7 +512,7 @@ LALSReport ::= SEQUENCE
PDHeaderReport ::= SEQUENCE
{
pDUSessionID [1] PDUSessionID,
pDUSessionID [1] PDUSessionID,
sourceIPAddress [2] IPAddress,
sourcePort [3] PortNumber OPTIONAL,
destinationIPAddress [4] IPAddress,
......@@ -834,9 +834,9 @@ UEEndpointAddress ::= CHOICE
Location ::= SEQUENCE
{
locationInfo [1] LocationInfo OPTIONAL,
positioningInfo [2] PositioningInfo OPTIONAL,
locationPresenceReport [3] LocationPresenceReport OPTIONAL
locationInfo [1] LocationInfo OPTIONAL,
positioningInfo [2] PositioningInfo OPTIONAL,
locationPresenceReport [3] LocationPresenceReport OPTIONAL
}
CellSiteInformation ::= SEQUENCE
......@@ -850,7 +850,7 @@ CellSiteInformation ::= SEQUENCE
LocationInfo ::= SEQUENCE
{
userLocation [1] UserLocation OPTIONAL,
currentLoc [2] BOOLEAN OPTIONAL,
currentLoc [2] BOOLEAN OPTIONAL,
geoInfo [3] GeographicArea OPTIONAL,
rATType [4] RATType OPTIONAL,
timeZone [5] TimeZone OPTIONAL,
......@@ -872,8 +872,8 @@ EUTRALocation ::= SEQUENCE
eCGI [2] ECGI,
ageOfLocatonInfo [3] INTEGER OPTIONAL,
uELocationTimestamp [4] Timestamp OPTIONAL,
geographicalInformation [5] UTF8String OPTIONAL,
geodeticInformation [6] UTF8String OPTIONAL,
geographicalInformation [5] UTF8String OPTIONAL,
geodeticInformation [6] UTF8String OPTIONAL,
globalNGENbID [7] GlobalRANNodeID OPTIONAL,
cellSiteInformation [8] CellSiteInformation OPTIONAL
}
......@@ -886,7 +886,7 @@ NRLocation ::= SEQUENCE
ageOfLocatonInfo [3] INTEGER OPTIONAL,
uELocationTimestamp [4] Timestamp OPTIONAL,
geographicalInformation [5] UTF8String OPTIONAL,
geodeticInformation [6] UTF8String OPTIONAL,
geodeticInformation [6] UTF8String OPTIONAL,
globalGNbID [7] GlobalRANNodeID OPTIONAL,
cellSiteInformation [8] CellSiteInformation OPTIONAL
}
......@@ -895,7 +895,7 @@ NRLocation ::= SEQUENCE
N3GALocation ::= SEQUENCE
{
tAI [1] TAI OPTIONAL,
n3IWFID [2] N3IWFIDNGAP OPTIONAL,
n3IWFID [2] N3IWFIDNGAP OPTIONAL,
uEIPAddr [3] IPAddr OPTIONAL,
portNumber [4] INTEGER OPTIONAL
}
......@@ -949,7 +949,7 @@ RANCGI ::= CHOICE
nCGI [2] NCGI
}
CellInformation ::= SEQUENCE
CellInformation ::= SEQUENCE
{
rANCGI [1] RANCGI,
cellSiteinformation [2] CellSiteInformation OPTIONAL,
......@@ -983,12 +983,12 @@ NGENbID ::= CHOICE
PositioningInfo ::= SEQUENCE
{
positionInfo [1] LocationData OPTIONAL,
rawMLPResponse [2] RawMLPResponse OPTIONAL
rawMLPResponse [2] RawMLPResponse OPTIONAL
}
RawMLPResponse ::= CHOICE
{
-- The following parameter contains a copy of unparsed XML code of the
-- The following parameter contains a copy of unparsed XML code of the
-- MLP response message, i.e. the entire XML document containing
-- a <slia> (described in OMA-TS-MLP-V3_5-20181211-C [20], clause 5.2.3.2.2) or
-- a <slirep> (described in OMA-TS-MLP-V3_5-20181211-C [20], clause 5.2.3.2.3) MLP message.
......@@ -1287,7 +1287,7 @@ HorizontalWithVerticalVelocityAndUncertainty ::= SEQUENCE
vUncertainty [6] SpeedUncertainty
}
-- The following types are described in TS 29.572 [24], table 6.1.6.3.2-1
-- The following types are described in TS 29.572 [24], table 6.1.6.3.2-1
Altitude ::= UTF8String
Angle ::= INTEGER (0..360)
Uncertainty ::= INTEGER (0..127)
......@@ -1351,4 +1351,4 @@ Usage ::= ENUMERATED
-- TS 29.571 [17], table 5.2.2-1
TimeZone ::= UTF8String
END
\ No newline at end of file
END
......@@ -155,13 +155,13 @@
<xs:pattern value="((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="IPv6Address">
<xs:restriction base="xs:token">
<xs:pattern value="([0-9a-f]{4}:){7}([0-9a-f]{4})"/>
</xs:restriction>
</xs:simpleType>
<xs:complexType name="PDHRReportingExtensions">
<xs:sequence>
<xs:element name="PDHType" type="PDHType"></xs:element>
......@@ -225,5 +225,5 @@
<xs:enumeration value="DoNotDeliver"></xs:enumeration>
</xs:restriction>
</xs:simpleType>
</xs:schema>
\ No newline at end of file
</xs:schema>
......@@ -96,4 +96,4 @@ EUI64 ::= OCTET STRING (SIZE(8))
SUCI ::= OCTET STRING (SIZE(8..3008))
END
END
\ No newline at end of file
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)}
......@@ -118,7 +118,7 @@ XIRIEvent ::= CHOICE
mMEIdentifierAssocation [63] MMEIdentifierAssocation,
-- PDU to MA PDU session-related events, see clause 6.2.3.2.8
sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification
sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification
}
-- ==============
......@@ -245,7 +245,7 @@ IRITargetIdentifier ::= SEQUENCE
CCPayload ::= SEQUENCE
{
cCPayloadOID [1] RELATIVE-OID,
cCPayloadOID [1] RELATIVE-OID,
pDU [2] CCPDU
}
......@@ -263,12 +263,12 @@ CCPDU ::= CHOICE
LINotificationPayload ::= SEQUENCE
{
lINotificationPayloadOID [1] RELATIVE-OID,
notification [2] LINotificationMessage
notification [2] LINotificationMessage
}
LINotificationMessage ::= CHOICE
{
lINotification [1] LINotification
lINotification [1] LINotification
}
-- ==================
......@@ -680,10 +680,10 @@ SMFMAAcceptedIndication ::= BOOLEAN
-- see Clause 6.1.6.3.8 of TS 29.502[16] for the details of this structure.
SMFErrorCodes ::= UTF8String
-- see Clause 6.1.6.3.2 of TS 29.502[16] for details of this structure.
-- see Clause 6.1.6.3.2 of TS 29.502[16] for details of this structure.
UEEPSPDNConnection ::= OCTET STRING
-- see Clause 6.1.6.3.6 of TS 29.502[16] for the details of this structure.
-- see Clause 6.1.6.3.6 of TS 29.502[16] for the details of this structure.
RequestIndication ::= ENUMERATED
{
uEREQPDUSESMOD(0),
......@@ -726,7 +726,7 @@ QFI ::= INTEGER (0..63)
-- 5G UDM definitions
-- ==================
UDMServingSystemMessage ::= SEQUENCE
UDMServingSystemMessage ::= SEQUENCE
{
sUPI [1] SUPI,
pEI [2] PEI OPTIONAL,
......@@ -952,7 +952,7 @@ MMSSendByNonLocalTarget ::= SEQUENCE
dRMContent [23] BOOLEAN OPTIONAL,
adaptationAllowed [24] MMSAdaptation OPTIONAL
}
MMSNotification ::= SEQUENCE
{
transactionID [1] UTF8String,
......@@ -968,7 +968,7 @@ MMSNotification ::= SEQUENCE
expiry [11] MMSExpiry,
replyCharging [12] MMSReplyCharging OPTIONAL
}
MMSSendToNonLocalTarget ::= SEQUENCE
{
version [1] MMSVersion,
......@@ -1022,7 +1022,7 @@ MMSRetrieval ::= SEQUENCE
state [12] MMState OPTIONAL,
flags [13] MMFlags OPTIONAL,
messageClass [14] MMSMessageClass OPTIONAL,
priority [15] MMSPriority,
priority [15] MMSPriority,
deliveryReport [16] BOOLEAN OPTIONAL,
readReport [17] BOOLEAN OPTIONAL,
replyCharging [18] MMSReplyCharging OPTIONAL,
......@@ -1056,7 +1056,7 @@ MMSForward ::= SEQUENCE
cCRecipients [6] SEQUENCE OF MMSParty OPTIONAL,
bCCRecipients [7] SEQUENCE OF MMSParty OPTIONAL,
direction [8] MMSDirection,
expiry [9] MMSExpiry OPTIONAL,
expiry [9] MMSExpiry OPTIONAL,
desiredDeliveryTime [10] Timestamp OPTIONAL,
deliveryReportAllowed [11] BOOLEAN OPTIONAL,
deliveryReport [12] BOOLEAN OPTIONAL,
......@@ -1068,10 +1068,10 @@ MMSForward ::= SEQUENCE
responseStatus [18] MMSResponseStatus,
responseStatusText [19] UTF8String OPTIONAL,
messageID [20] UTF8String OPTIONAL,
contentLocationConf [21] UTF8String OPTIONAL,
contentLocationConf [21] UTF8String OPTIONAL,
storeStatus [22] MMSStoreStatus OPTIONAL,
storeStatusText [23] UTF8String OPTIONAL
}
}
MMSDeleteFromRelay ::= SEQUENCE
{
......@@ -1089,13 +1089,13 @@ MMSMBoxStore ::= SEQUENCE
transactionID [1] UTF8String,
version [2] MMSVersion,
direction [3] MMSDirection,
contentLocationReq [4] UTF8String,
contentLocationReq [4] UTF8String,
state [5] MMState OPTIONAL,
flags [6] MMFlags OPTIONAL,
contentLocationConf [7] UTF8String OPTIONAL,
contentLocationConf [7] UTF8String OPTIONAL,
storeStatus [8] MMSStoreStatus,
storeStatusText [9] UTF8String OPTIONAL
}
}
MMSMBoxUpload ::= SEQUENCE
{
......@@ -1105,11 +1105,11 @@ MMSMBoxUpload ::= SEQUENCE
state [4] MMState OPTIONAL,
flags [5] MMFlags OPTIONAL,
contentType [6] UTF8String,
contentLocation [7] UTF8String OPTIONAL,
contentLocation [7] UTF8String OPTIONAL,
storeStatus [8] MMSStoreStatus,
storeStatusText [9] UTF8String OPTIONAL,
mMessages [10] SEQUENCE OF MMBoxDescription
}
}
MMSMBoxDelete ::= SEQUENCE
{
......@@ -1189,7 +1189,7 @@ MMSCancel ::= SEQUENCE
version [2] MMSVersion,
cancelID [3] UTF8String,
direction [4] MMSDirection
}
}
MMSMBoxViewRequest ::= SEQUENCE
{
......@@ -1246,7 +1246,7 @@ MMBoxDescription ::= SEQUENCE
-- =========
-- MMS CCPDU
-- =========
MMSCCPDU ::= SEQUENCE
{
version [1] MMSVersion,
......@@ -1312,7 +1312,7 @@ MMSDeleteResponseStatus ::= ENUMERATED
errorPermanentReplyChargingNotSupported(24),
errorPermanentAddressHidingNotSupported(25),
errorPermanentLackOfPrepaid(26)
}
}
MMSDirection ::= ENUMERATED
{
......@@ -1327,13 +1327,13 @@ MMSElementDescriptor ::= SEQUENCE
value [3] UTF8String OPTIONAL
}
MMSExpiry ::= SEQUENCE
MMSExpiry ::= SEQUENCE
{
expiryPeriod [1] INTEGER,
periodFormat [2] MMSPeriodFormat
periodFormat [2] MMSPeriodFormat
}
MMFlags ::= SEQUENCE
MMFlags ::= SEQUENCE
{
length [1] INTEGER,
flag [2] MMStateFlag,
......@@ -1363,7 +1363,7 @@ MMSPartyID ::= CHOICE
iMPI [5] IMPI,
sUPI [6] SUPI,
gPSI [7] GPSI
}
}
MMSPeriodFormat ::= ENUMERATED
{
......@@ -1511,7 +1511,7 @@ MMSVersion ::= SEQUENCE
{
majorVersion [1] INTEGER,
minorVersion [2] INTEGER
}
}
-- ==================
-- 5G PTC definitions
......@@ -1568,7 +1568,7 @@ PTCSessionEnd ::= SEQUENCE
pTCDirection [2] Direction,
pTCServerURI [3] UTF8String,
pTCSessionInfo [4] PTCSessionInfo,
pTCParticipants [5] SEQUENCE OF PTCTargetInformation OPTIONAL,
pTCParticipants [5] SEQUENCE OF PTCTargetInformation OPTIONAL,
location [6] Location OPTIONAL,
pTCSessionEndCause [7] PTCSessionEndCause
}
......@@ -1578,7 +1578,7 @@ PTCStartOfInterception ::= SEQUENCE
pTCTargetInformation [1] PTCTargetInformation,
pTCDirection [2] Direction,
preEstSessionID [3] PTCSessionInfo OPTIONAL,
pTCOriginatingID [4] PTCTargetInformation,
pTCOriginatingID [4] PTCTargetInformation,
pTCSessionInfo [5] PTCSessionInfo OPTIONAL,
pTCHost [6] PTCTargetInformation OPTIONAL,
pTCParticipants [7] SEQUENCE OF PTCTargetInformation OPTIONAL,
......@@ -1748,7 +1748,7 @@ PTCIdentifiers ::= CHOICE
PTCSessionInfo ::= SEQUENCE
{
pTCSessionURI [1] UTF8String,
pTCSessionURI [1] UTF8String,
pTCSessionType [2] PTCSessionType
}
......@@ -1792,7 +1792,7 @@ RTPSetting ::= SEQUENCE
PTCIDList ::= SEQUENCE
{
pTCPartyID [1] PTCTargetInformation,
pTCChatGroupID [2] PTCChatGroupID
pTCChatGroupID [2] PTCChatGroupID
}
PTCChatGroupID ::= SEQUENCE
......@@ -1897,7 +1897,7 @@ PTCAccessPolicyFailure ::= ENUMERATED
{
requestUnsuccessful(1),
requestUnknown(2)
}
}
-- ===================
-- 5G LALS definitions
......@@ -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
}
-- =====================
......@@ -1917,7 +1920,7 @@ LALSReport ::= SEQUENCE
PDHeaderReport ::= SEQUENCE
{
pDUSessionID [1] PDUSessionID,
pDUSessionID [1] PDUSessionID,
sourceIPAddress [2] IPAddress,
sourcePort [3] PortNumber OPTIONAL,
destinationIPAddress [4] IPAddress,
......@@ -2317,9 +2320,9 @@ UEEndpointAddress ::= CHOICE
Location ::= SEQUENCE
{
locationInfo [1] LocationInfo OPTIONAL,
positioningInfo [2] PositioningInfo OPTIONAL,
locationPresenceReport [3] LocationPresenceReport OPTIONAL
locationInfo [1] LocationInfo OPTIONAL,
positioningInfo [2] PositioningInfo OPTIONAL,
locationPresenceReport [3] LocationPresenceReport OPTIONAL
}
CellSiteInformation ::= SEQUENCE
......@@ -2333,7 +2336,7 @@ CellSiteInformation ::= SEQUENCE
LocationInfo ::= SEQUENCE
{
userLocation [1] UserLocation OPTIONAL,
currentLoc [2] BOOLEAN OPTIONAL,
currentLoc [2] BOOLEAN OPTIONAL,
geoInfo [3] GeographicArea OPTIONAL,
rATType [4] RATType OPTIONAL,
timeZone [5] TimeZone OPTIONAL,
......@@ -2355,8 +2358,8 @@ EUTRALocation ::= SEQUENCE
eCGI [2] ECGI,
ageOfLocatonInfo [3] INTEGER OPTIONAL,
uELocationTimestamp [4] Timestamp OPTIONAL,
geographicalInformation [5] UTF8String OPTIONAL,
geodeticInformation [6] UTF8String OPTIONAL,
geographicalInformation [5] UTF8String OPTIONAL,
geodeticInformation [6] UTF8String OPTIONAL,
globalNGENbID [7] GlobalRANNodeID OPTIONAL,
cellSiteInformation [8] CellSiteInformation OPTIONAL,
globalENbID [9] GlobalRANNodeID OPTIONAL
......@@ -2370,7 +2373,7 @@ NRLocation ::= SEQUENCE
ageOfLocatonInfo [3] INTEGER OPTIONAL,
uELocationTimestamp [4] Timestamp OPTIONAL,
geographicalInformation [5] UTF8String OPTIONAL,
geodeticInformation [6] UTF8String OPTIONAL,
geodeticInformation [6] UTF8String OPTIONAL,
globalGNbID [7] GlobalRANNodeID OPTIONAL,
cellSiteInformation [8] CellSiteInformation OPTIONAL
}
......@@ -2379,9 +2382,15 @@ NRLocation ::= SEQUENCE
N3GALocation ::= SEQUENCE
{
tAI [1] TAI OPTIONAL,
n3IWFID [2] N3IWFIDNGAP 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
......@@ -2423,7 +2434,7 @@ ECGI ::= SEQUENCE
{
pLMNID [1] PLMNID,
eUTRACellID [2] EUTRACellID,
nID [3] NID OPTIONAL
nID [3] NID OPTIONAL
}
TAIList ::= SEQUENCE OF TAI
......@@ -2442,7 +2453,7 @@ RANCGI ::= CHOICE
nCGI [2] NCGI
}
CellInformation ::= SEQUENCE
CellInformation ::= SEQUENCE
{
rANCGI [1] RANCGI,
cellSiteinformation [2] CellSiteInformation OPTIONAL,
......@@ -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))
......@@ -2488,12 +2544,12 @@ ENbID ::= CHOICE
PositioningInfo ::= SEQUENCE
{
positionInfo [1] LocationData OPTIONAL,
rawMLPResponse [2] RawMLPResponse OPTIONAL
rawMLPResponse [2] RawMLPResponse OPTIONAL
}
RawMLPResponse ::= CHOICE
{
-- The following parameter contains a copy of unparsed XML code of the
-- The following parameter contains a copy of unparsed XML code of the
-- MLP response message, i.e. the entire XML document containing
-- a <slia> (described in OMA-TS-MLP-V3_5-20181211-C [20], clause 5.2.3.2.2) or
-- a <slirep> (described in OMA-TS-MLP-V3_5-20181211-C [20], clause 5.2.3.2.3) MLP message.
......@@ -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
{
......@@ -2797,7 +2857,7 @@ HorizontalWithVerticalVelocityAndUncertainty ::= SEQUENCE
vUncertainty [6] SpeedUncertainty
}
-- The following types are described in TS 29.572 [24], table 6.1.6.3.2-1
-- The following types are described in TS 29.572 [24], table 6.1.6.3.2-1
Altitude ::= UTF8String
Angle ::= INTEGER (0..360)
Uncertainty ::= INTEGER (0..127)
......@@ -2877,4 +2937,4 @@ OGCURN ::= UTF8String
-- TS 29.572 [24], clause 6.1.6.2.15
MethodCode ::= INTEGER (16..31)
END
END
\ No newline at end of file
<?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>
......@@ -112,5 +113,107 @@
<xs:element name="PEIMAC" type="common:MACAddress"/>
</xs:choice>
</xs:complexType>
</xs:schema>
<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>