Commit 74f0f51f authored by canterburym's avatar canterburym
Browse files

Merge branch 'trialmerge/sa93e/1' into 'main'

Trial merge for SA93e

See merge request !94
parents e1dfe288 bd01b8d9
Pipeline #5275 passed with stages
in 2 minutes
TS33128Payloads 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) version7(7)}
DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=
...@@ -9,7 +9,7 @@ BEGIN ...@@ -9,7 +9,7 @@ BEGIN
-- Relative OIDs -- Relative OIDs
-- ============= -- =============
tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version6(6)} tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version7(7)}
xIRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)} xIRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)}
xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)} xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
...@@ -253,7 +253,8 @@ CCPDU ::= CHOICE ...@@ -253,7 +253,8 @@ CCPDU ::= CHOICE
{ {
uPFCCPDU [1] UPFCCPDU, uPFCCPDU [1] UPFCCPDU,
extendedUPFCCPDU [2] ExtendedUPFCCPDU, extendedUPFCCPDU [2] ExtendedUPFCCPDU,
mMSCCPDU [3] MMSCCPDU mMSCCPDU [3] MMSCCPDU,
pTCCCPDU [4] PTCCCPDU
} }
-- =========================== -- ===========================
...@@ -1704,6 +1705,11 @@ PTCAccessPolicy ::= SEQUENCE ...@@ -1704,6 +1705,11 @@ PTCAccessPolicy ::= SEQUENCE
pTCAccessPolicyFailure [7] PTCAccessPolicyFailure OPTIONAL pTCAccessPolicyFailure [7] PTCAccessPolicyFailure OPTIONAL
} }
-- =========
-- PTC CCPDU
-- =========
PTCCCPDU ::= OCTET STRING
-- ================= -- =================
-- 5G PTC parameters -- 5G PTC parameters
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="urn:3GPP:ns:li:3GPPIdentityExtensions:r16:v3" xmlns="urn:3GPP:ns:li:3GPPIdentityExtensions:r16:v4"
xmlns:x1="http://uri.etsi.org/03221/X1/2017/10" xmlns:x1="http://uri.etsi.org/03221/X1/2017/10"
xmlns:common="http://uri.etsi.org/03280/common/2017/07" xmlns:common="http://uri.etsi.org/03280/common/2017/07"
targetNamespace="urn:3GPP:ns:li:3GPPIdentityExtensions:r16:v3" targetNamespace="urn:3GPP:ns:li:3GPPIdentityExtensions:r16:v4"
elementFormDefault="qualified"> elementFormDefault="qualified">
<xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/> <xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
<xs:simpleType name="TAC"> <xs:simpleType name="TAC">
<xs:restriction base="xs:string"> <xs:restriction base="xs:string">
<xs:pattern value="[A-Fa-f0-9]{4}"></xs:pattern> <xs:pattern value="([A-Fa-f0-9]{2}){2,3}"></xs:pattern>
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
......
TS33128Payloads TS33128Payloads
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r17(17) version0(0)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r17(17) version1(1)}
DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=
...@@ -9,7 +9,7 @@ BEGIN ...@@ -9,7 +9,7 @@ BEGIN
-- Relative OIDs -- Relative OIDs
-- ============= -- =============
tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r17(17) version0(0)} tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r17(17) version1(1)}
xIRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)} xIRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)}
xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)} xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
...@@ -114,8 +114,8 @@ XIRIEvent ::= CHOICE ...@@ -114,8 +114,8 @@ XIRIEvent ::= CHOICE
unsuccessfulMASMProcedure [61] SMFMAUnsuccessfulProcedure, unsuccessfulMASMProcedure [61] SMFMAUnsuccessfulProcedure,
-- Identifier Association events, see clauses 6.2.2.2.7 and 6.3.2.2.2 -- Identifier Association events, see clauses 6.2.2.2.7 and 6.3.2.2.2
aMFIdentifierAssocation [62] AMFIdentifierAssocation, aMFIdentifierAssociation [62] AMFIdentifierAssociation,
mMEIdentifierAssocation [63] MMEIdentifierAssocation, mMEIdentifierAssociation [63] MMEIdentifierAssociation,
-- PDU to MA PDU session-related events, see clause 6.2.3.2.8 -- PDU to MA PDU session-related events, see clause 6.2.3.2.8
sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification, sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification,
...@@ -146,14 +146,28 @@ XIRIEvent ::= CHOICE ...@@ -146,14 +146,28 @@ XIRIEvent ::= CHOICE
sCEFMSISDNLessMOSMS [85] SCEFMSISDNLessMOSMS, sCEFMSISDNLessMOSMS [85] SCEFMSISDNLessMOSMS,
sCEFCommunicationPatternUpdate [86] SCEFCommunicationPatternUpdate, sCEFCommunicationPatternUpdate [86] SCEFCommunicationPatternUpdate,
--EPS Events, see clause 6.3 -- EPS Events, see clause 6.3
--MME Events, see clause 6.3.2.2 -- MME Events, see clause 6.3.2.2
mMEAttach [87] MMEAttach, mMEAttach [87] MMEAttach,
mMEDetach [88] MMEDetach, mMEDetach [88] MMEDetach,
mMELocationUpdate [89] MMELocationUpdate, mMELocationUpdate [89] MMELocationUpdate,
mMEStartOfInterceptionWithEPSAttachedUE [90] MMEStartOfInterceptionWithEPSAttachedUE, mMEStartOfInterceptionWithEPSAttachedUE [90] MMEStartOfInterceptionWithEPSAttachedUE,
mMEUnsuccessfulProcedure [91] MMEUnsuccessfulProcedure mMEUnsuccessfulProcedure [91] MMEUnsuccessfulProcedure,
-- AKMA key management events, see clause 7.9.1
aAnFAnchorKeyRegister [92] AAnFAnchorKeyRegister,
aAnFKAKMAApplicationKeyGet [93] AAnFKAKMAApplicationKeyGet,
aAnFStartOfInterceptWithEstablishedAKMAKeyMaterial [94] AAnFStartOfInterceptWithEstablishedAKMAKeyMaterial,
aAnFAKMAContextRemovalRecord [95] AAnFAKMAContextRemovalRecord,
aFAKMAApplicationKeyRefresh [96] AFAKMAApplicationKeyRefresh,
aFStartOfInterceptWithEstablishedAKMAApplicationKey [97] AFStartOfInterceptWithEstablishedAKMAApplicationKey,
aFAuxiliarySecurityParameterEstablishment [98] AFAuxiliarySecurityParameterEstablishment,
aFApplicationKeyRemoval [99] AFApplicationKeyRemoval,
-- HR LI Events, see clause 7.10.3.3
n9HRPDUSessionInfo [100] N9HRPDUSessionInfo,
s8HRBearerInfo [101] S8HRBearerInfo
} }
-- ============== -- ==============
...@@ -261,8 +275,8 @@ IRIEvent ::= CHOICE ...@@ -261,8 +275,8 @@ IRIEvent ::= CHOICE
unsuccessfulMASMProcedure [61] SMFMAUnsuccessfulProcedure, unsuccessfulMASMProcedure [61] SMFMAUnsuccessfulProcedure,
-- Identifier Association events, see clauses 6.2.2.2.7 and 6.3.2.2.2 -- Identifier Association events, see clauses 6.2.2.2.7 and 6.3.2.2.2
aMFIdentifierAssocation [62] AMFIdentifierAssocation, aMFIdentifierAssociation [62] AMFIdentifierAssociation,
mMEIdentifierAssocation [63] MMEIdentifierAssocation, mMEIdentifierAssociation [63] MMEIdentifierAssociation,
-- PDU to MA PDU session-related events, see clause 6.2.3.2.8 -- PDU to MA PDU session-related events, see clause 6.2.3.2.8
sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification, sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification,
...@@ -293,14 +307,27 @@ IRIEvent ::= CHOICE ...@@ -293,14 +307,27 @@ IRIEvent ::= CHOICE
sCEFMSISDNLessMOSMS [85] SCEFMSISDNLessMOSMS, sCEFMSISDNLessMOSMS [85] SCEFMSISDNLessMOSMS,
sCEFCommunicationPatternUpdate [86] SCEFCommunicationPatternUpdate, sCEFCommunicationPatternUpdate [86] SCEFCommunicationPatternUpdate,
--EPS Events, see clause 6.3 -- EPS Events, see clause 6.3
--MME Events, see clause 6.3.2.2 -- MME Events, see clause 6.3.2.2
mMEAttach [87] MMEAttach, mMEAttach [87] MMEAttach,
mMEDetach [88] MMEDetach, mMEDetach [88] MMEDetach,
mMELocationUpdate [89] MMELocationUpdate, mMELocationUpdate [89] MMELocationUpdate,
mMEStartOfInterceptionWithEPSAttachedUE [90] MMEStartOfInterceptionWithEPSAttachedUE, mMEStartOfInterceptionWithEPSAttachedUE [90] MMEStartOfInterceptionWithEPSAttachedUE,
mMEUnsuccessfulProcedure [91] MMEUnsuccessfulProcedure mMEUnsuccessfulProcedure [91] MMEUnsuccessfulProcedure,
-- AKMA key management events, see clause 7.9.1
aAnFAnchorKeyRegister [92] AAnFAnchorKeyRegister,
aAnFKAKMAApplicationKeyGet [93] AAnFKAKMAApplicationKeyGet,
aAnFStartOfInterceptWithEstablishedAKMAKeyMaterial [94] AAnFStartOfInterceptWithEstablishedAKMAKeyMaterial,
aAnFAKMAContextRemovalRecord [95] AAnFAKMAContextRemovalRecord,
aFAKMAApplicationKeyRefresh [96] AFAKMAApplicationKeyRefresh,
aFStartOfInterceptWithEstablishedAKMAApplicationKey [97] AFStartOfInterceptWithEstablishedAKMAApplicationKey,
aFAuxiliarySecurityParameterEstablishment [98] AFAuxiliarySecurityParameterEstablishment,
aFApplicationKeyRemoval [99] AFApplicationKeyRemoval
-- tag 100 is reserved because there is no equivalent n9HRPDUSessionInfo in IRIEvent.
-- tag 101 is reserved because there is no equivalent S8HRBearerInfo in IRIEvent.
} }
IRITargetIdentifier ::= SEQUENCE IRITargetIdentifier ::= SEQUENCE
...@@ -324,7 +351,8 @@ CCPDU ::= CHOICE ...@@ -324,7 +351,8 @@ CCPDU ::= CHOICE
uPFCCPDU [1] UPFCCPDU, uPFCCPDU [1] UPFCCPDU,
extendedUPFCCPDU [2] ExtendedUPFCCPDU, extendedUPFCCPDU [2] ExtendedUPFCCPDU,
mMSCCPDU [3] MMSCCPDU, mMSCCPDU [3] MMSCCPDU,
nIDDCCPDU [4] NIDDCCPDU nIDDCCPDU [4] NIDDCCPDU,
pTCCCPDU [5] PTCCCPDU
} }
-- =========================== -- ===========================
...@@ -341,6 +369,59 @@ LINotificationMessage ::= CHOICE ...@@ -341,6 +369,59 @@ LINotificationMessage ::= CHOICE
{ {
lINotification [1] LINotification lINotification [1] LINotification
} }
-- =================
-- HR LI definitions
-- =================
N9HRPDUSessionInfo ::= SEQUENCE
{
sUPI [1] SUPI,
pEI [2] PEI OPTIONAL,
pDUSessionID [3] PDUSessionID,
location [4] Location OPTIONAL,
sNSSAI [5] SNSSAI OPTIONAL,
dNN [6] DNN OPTIONAL,
messageCause [7] N9HRMessageCause
}
S8HRBearerInfo ::= SEQUENCE
{
iMSI [1] IMSI,
iMEI [2] IMEI OPTIONAL,
bearerID [3] EPSBearerID,
linkedBearerID [4] EPSBearerID OPTIONAL,
location [5] Location OPTIONAL,
aPN [6] APN OPTIONAL,
sGWIPAddress [7] IPAddress OPTIONAL,
messageCause [8] S8HRMessageCause
}
-- ================
-- HR LI parameters
-- ================
N9HRMessageCause ::= ENUMERATED
{
pDUSessionEstablished(1),
pDUSessionModified(2),
pDUSessionReleased(3),
updatedLocationAvailable(4),
sMFChanged(5),
other(6)
}
S8HRMessageCause ::= ENUMERATED
{
bearerActivated(1),
bearerModified(2),
bearerDeleted(3),
pDNDisconnected(4),
updatedLocationAvailable(5),
sGWChanged(6),
other(7)
}
-- ================== -- ==================
-- 5G NEF definitions -- 5G NEF definitions
-- ================== -- ==================
...@@ -814,6 +895,191 @@ EPSBearerID ::= INTEGER (0..255) ...@@ -814,6 +895,191 @@ EPSBearerID ::= INTEGER (0..255)
APN ::= UTF8String APN ::= UTF8String
-- =======================
-- AKMA AAnF definitions
-- =======================
AAnFAnchorKeyRegister ::= SEQUENCE
{
aKID [1] NAI,
sUPI [2] SUPI,
kAKMA [3] KAKMA OPTIONAL
}
AAnFKAKMAApplicationKeyGet ::= SEQUENCE
{
type [1] KeyGetType,
aKID [2] NAI,
keyInfo [3] AFKeyInfo
}
AAnFStartOfInterceptWithEstablishedAKMAKeyMaterial ::= SEQUENCE
{
aKID [1] NAI,
kAKMA [2] KAKMA OPTIONAL,
aFKeyList [3] SEQUENCE OF AFKeyInfo OPTIONAL
}
AAnFAKMAContextRemovalRecord ::= SEQUENCE
{
aKID [1] NAI,
nFID [2] NFID
}
-- ======================
-- AKMA common parameters
-- ======================
FQDN ::= UTF8String
NFID ::= UTF8String
UAProtocolID ::= OCTET STRING (SIZE(5))
AKMAAFID ::= SEQUENCE
{
aFFQDN [1] FQDN,
uaProtocolID [2] UAProtocolID
}
UAStarParams ::= CHOICE
{
tls12 [1] TLS12UAStarParams,
generic [2] GenericUAStarParams
}
GenericUAStarParams ::= SEQUENCE
{
genericClientParams [1] OCTET STRING,
genericServerParams [2] OCTET STRING
}
-- ===========================================
-- Specific UaStarParmas for TLS 1.2 (RFC5246)
-- ===========================================
TLSCipherType ::= ENUMERATED
{
stream(1),
block(2),
aead(3)
}
TLSCompressionAlgorithm ::= ENUMERATED
{
null(1),
deflate(2)
}
TLSPRFAlgorithm ::= ENUMERATED
{
rfc5246(1)
}
TLSCipherSuite ::= SEQUENCE (SIZE(2)) OF INTEGER (0..255)
TLS12UAStarParams ::= SEQUENCE
{
preMasterSecret [1] OCTET STRING (SIZE(6)) OPTIONAL,
masterSecret [2] OCTET STRING (SIZE(6)),
pRFAlgorithm [3] TLSPRFAlgorithm,
cipherSuite [4] TLSCipherSuite,
cipherType [5] TLSCipherType,
encKeyLength [6] INTEGER (0..255),
blockLength [7] INTEGER (0..255),
fixedIVLength [8] INTEGER (0..255),
recordIVLength [9] INTEGER (0..255),
macLength [10] INTEGER (0..255),
macKeyLength [11] INTEGER (0..255),
compressionAlgorithm [12] TLSCompressionAlgorithm,
clientRandom [13] OCTET STRING (SIZE(4)),
serverRandom [14] OCTET STRING (SIZE(4)),
clientSequenceNumber [15] INTEGER,
serverSequenceNumber [16] INTEGER,
sessionID [17] OCTET STRING (SIZE(0..32)),
tLSExtensions [18] OCTET STRING (SIZE(0..65535))
}
KAF ::= OCTET STRING
KAKMA ::= OCTET STRING
-- ====================
-- AKMA AAnF parameters
-- ====================
KeyGetType ::= ENUMERATED
{
internal(1),
external(2)
}
AFKeyInfo ::= SEQUENCE
{
aFID [1] AKMAAFID,
kAF [2] KAF,
kAFExpTime [3] KAFExpiryTime
}
-- =======================
-- AKMA AF definitions
-- =======================
AFAKMAApplicationKeyRefresh ::= SEQUENCE
{
aFID [1] AFID,
aKID [2] NAI,
kAF [3] KAF,
uaStarParams [4] UAStarParams OPTIONAL
}
AFStartOfInterceptWithEstablishedAKMAApplicationKey ::= SEQUENCE
{
aFID [1] FQDN,
aKID [2] NAI,
kAFParamList [3] SEQUENCE OF AFSecurityParams
}
AFAuxiliarySecurityParameterEstablishment ::= SEQUENCE
{
aFSecurityParams [1] AFSecurityParams
}
AFSecurityParams ::= SEQUENCE
{
aFID [1] AFID,
aKID [2] NAI,
kAF [3] KAF,
uaStarParams [4] UAStarParams
}
AFApplicationKeyRemoval ::= SEQUENCE
{
aFID [1] AFID,
aKID [2] NAI,
removalCause [3] AFKeyRemovalCause
}
-- ===================
-- AKMA AF parameters
-- ===================
KAFParams ::= SEQUENCE
{
aKID [1] NAI,
kAF [2] KAF,
kAFExpTime [3] KAFExpiryTime,
uaStarParams [4] UAStarParams
}
KAFExpiryTime ::= GeneralizedTime
AFKeyRemovalCause ::= ENUMERATED
{
unknown(1),
keyExpiry(2),
applicationSpecific(3)
}
-- ================== -- ==================
-- 5G AMF definitions -- 5G AMF definitions
...@@ -835,7 +1101,9 @@ AMFRegistration ::= SEQUENCE ...@@ -835,7 +1101,9 @@ AMFRegistration ::= SEQUENCE
fiveGSTAIList [11] TAIList OPTIONAL, fiveGSTAIList [11] TAIList OPTIONAL,
sMSOverNasIndicator [12] SMSOverNASIndicator OPTIONAL, sMSOverNasIndicator [12] SMSOverNASIndicator OPTIONAL,
oldGUTI [13] EPS5GGUTI OPTIONAL, oldGUTI [13] EPS5GGUTI OPTIONAL,
eMM5GRegStatus [14] EMM5GMMStatus OPTIONAL eMM5GRegStatus [14] EMM5GMMStatus OPTIONAL,
nonIMEISVPEI [15] NonIMEISVPEI OPTIONAL,
mACRestIndicator [16] MACRestrictionIndicator OPTIONAL
} }
-- See clause 6.2.2.2.3 for details of this structure -- See clause 6.2.2.2.3 for details of this structure
...@@ -2260,6 +2528,11 @@ PTCAccessPolicy ::= SEQUENCE ...@@ -2260,6 +2528,11 @@ PTCAccessPolicy ::= SEQUENCE
pTCAccessPolicyFailure [7] PTCAccessPolicyFailure OPTIONAL pTCAccessPolicyFailure [7] PTCAccessPolicyFailure OPTIONAL
} }
-- =========
-- PTC CCPDU
-- =========
PTCCCPDU ::= OCTET STRING
-- ================= -- =================
-- 5G PTC parameters -- 5G PTC parameters
...@@ -2521,7 +2794,7 @@ PDSRSummaryTrigger ::= ENUMERATED ...@@ -2521,7 +2794,7 @@ PDSRSummaryTrigger ::= ENUMERATED
-- Identifier Association definitions -- Identifier Association definitions
-- ================================== -- ==================================
AMFIdentifierAssocation ::= SEQUENCE AMFIdentifierAssociation ::= SEQUENCE
{ {
sUPI [1] SUPI, sUPI [1] SUPI,
sUCI [2] SUCI OPTIONAL, sUCI [2] SUCI OPTIONAL,
...@@ -2532,7 +2805,7 @@ AMFIdentifierAssocation ::= SEQUENCE ...@@ -2532,7 +2805,7 @@ AMFIdentifierAssocation ::= SEQUENCE
fiveGSTAIList [7] TAIList OPTIONAL fiveGSTAIList [7] TAIList OPTIONAL
} }
MMEIdentifierAssocation ::= SEQUENCE MMEIdentifierAssociation ::= SEQUENCE
{ {
iMSI [1] IMSI, iMSI [1] IMSI,
iMEI [2] IMEI OPTIONAL, iMEI [2] IMEI OPTIONAL,
...@@ -2883,6 +3156,13 @@ IPv6FlowLabel ::= INTEGER(0..1048575) ...@@ -2883,6 +3156,13 @@ IPv6FlowLabel ::= INTEGER(0..1048575)
MACAddress ::= OCTET STRING (SIZE(6)) MACAddress ::= OCTET STRING (SIZE(6))
MACRestrictionIndicator ::= ENUMERATED
{
noResrictions(1),
mACAddressNotUseableAsEquipmentIdentifier(2),
unknown(3)
}
MCC ::= NumericString (SIZE(3)) MCC ::= NumericString (SIZE(3))
MNC ::= NumericString (SIZE(2..3)) MNC ::= NumericString (SIZE(2..3))
...@@ -2909,6 +3189,11 @@ NonLocalID ::= ENUMERATED ...@@ -2909,6 +3189,11 @@ NonLocalID ::= ENUMERATED
nonLocal(2) nonLocal(2)
} }
NonIMEISVPEI ::= CHOICE
{
mACAddress [1] MACAddress
}
NSSAI ::= SEQUENCE OF SNSSAI NSSAI ::= SEQUENCE OF SNSSAI
PLMNID ::= SEQUENCE PLMNID ::= SEQUENCE
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="urn:3GPP:ns:li:3GPPIdentityExtensions:r17:v1" xmlns="urn:3GPP:ns:li:3GPPIdentityExtensions:r17:v2"
xmlns:x1="http://uri.etsi.org/03221/X1/2017/10" xmlns:x1="http://uri.etsi.org/03221/X1/2017/10"
xmlns:common="http://uri.etsi.org/03280/common/2017/07" xmlns:common="http://uri.etsi.org/03280/common/2017/07"
targetNamespace="urn:3GPP:ns:li:3GPPIdentityExtensions:r17:v1" targetNamespace="urn:3GPP:ns:li:3GPPIdentityExtensions:r17:v2"
elementFormDefault="qualified"> elementFormDefault="qualified">
<xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/> <xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
<xs:simpleType name="TAC"> <xs:simpleType name="TAC">
<xs:restriction base="xs:string"> <xs:restriction base="xs:string">
<xs:pattern value="[A-Fa-f0-9]{4}"></xs:pattern> <xs:pattern value="([A-Fa-f0-9]{2}){2,3}"></xs:pattern>
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns="urn:3GPP:ns:li:3GPPX1Extensions:r16:v3" xmlns="urn:3GPP:ns:li:3GPPX1Extensions:r17:v1"
targetNamespace="urn:3GPP:ns:li:3GPPX1Extensions:r16:v3" xmlns:common="http://uri.etsi.org/03280/common/2017/07"
targetNamespace="urn:3GPP:ns:li:3GPPX1Extensions:r17:v1"
elementFormDefault="qualified"> elementFormDefault="qualified">
<xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
<xs:element name="X1Extensions" type="X1Extension"></xs:element> <xs:element name="X1Extensions" type="X1Extension"></xs:element>
<xs:complexType name="X1Extensions"> <xs:complexType name="X1Extensions">
<xs:sequence> <xs:sequence>
...@@ -11,8 +14,8 @@ ...@@ -11,8 +14,8 @@
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:element name="PTCLIX1TargetIdentifierExtensions" type="PTCLIX1TargetIdentifierExtensions"></xs:element> <xs:element name="PTCLIX1TargetIdentifierExtensions" type="PTCLIX1TargetIdentifierExtensions"></xs:element>
<xs:complexType name="PTCLIX1TargetIdentifierExtensions"> <xs:complexType name="PTCLIX1TargetIdentifierExtensions">
<xs:sequence> <xs:sequence>
<xs:element