Merge branch 'meeting/SA97e' into 'main' (3905e5d5) · Commits · SA3 / SA3 LI

.gitlab-ci.yml

+32 −2

Original line number	Diff line number	Diff line
		workflow:
		rules:
		- if: $CI_PIPELINE_SOURCE == "merge_request_event"
		- if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
		when: never
		- if: $CI_COMMIT_BRANCH

		stages:
		- check
		- build

		process_asn:
		image: "mcanterb/asn1test:latest"
		image: "forge.3gpp.org:5050/sa3/li/asn1test:latest"
		stage: check
		interruptible: true
		script:
		- python3 testing/asn_process.py

		process_xsd:
		image: "mcanterb/xsdtest:latest"
		image: "forge.3gpp.org:5050/sa3/li/xsdtest:latest"
		stage: check
		interruptible: true
		script:
		- python3 testing/xsd_process.py

		generate_artefacts:
		image: "forge.3gpp.org:5050/sa3/li/artefacts:latest"
		stage: build
		interruptible: true
		rules:
		- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
		script:
		- echo $CI_PROJECT_ID
		- echo $CI_PROJECT_NAME
		- echo $CI_PROJECT_PATH
		- echo $CI_PIPELINE_SOURCE
		- echo $CI_OPEN_MERGE_REQUESTS
		- echo $CI_MERGE_REQUEST_IID
		- echo $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
		- echo $ARTEFACT_NAME
		- forgelib-changedocs -v https://$CI_SERVER_HOST $CI_PROJECT_ID $CI_PROJECT_PATH $CI_MERGE_REQUEST_IID
		artifacts:
		untracked: true
		paths:
		- "*.docx"
		name: $CI_MERGE_REQUEST_TITLE
		expire_in: 30 days

33128/r16/TS33128Payloads.asn

+19 −12

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) version10(10)}
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r16(16) version11(11)}

		DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=

		@@ -9,7 +9,7 @@ BEGIN
		-- Relative OIDs
		-- =============

		tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version10(10)}
		tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version11(11)}

		xIRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)}
		xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
		@@ -2305,7 +2305,14 @@ TargetIdentifier ::= CHOICE
		nAI [7] NAI,
		iPv4Address [8] IPv4Address,
		iPv6Address [9] IPv6Address,
		ethernetAddress [10] MACAddress
		ethernetAddress [10] MACAddress,
		iMPU [11] IMPU,
		iMPI [12] IMPI,
		e164Number [13] E164Number,
		emailAddress [14] EmailAddress,
		mCPTTID [15] UTF8String,
		instanceIdentifierURN [16] UTF8String,
		pTCChatGroupID [17] PTCChatGroupID
		}

		TargetIdentifierProvenance ::= ENUMERATED

33128/r17/TS33128Payloads.asn

+411 −72

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) r17(17) version4(4)}
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r17(17) version5(5)}

		DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=

		@@ -9,7 +9,7 @@ BEGIN
		-- Relative OIDs
		-- =============

		tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r17(17) version4(4)}
		tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r17(17) version5(5)}

		xIRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)}
		xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
		@@ -1152,7 +1152,8 @@ AMFRegistration ::= SEQUENCE
		oldGUTI [13] EPS5GGUTI OPTIONAL,
		eMM5GRegStatus [14] EMM5GMMStatus OPTIONAL,
		nonIMEISVPEI [15] NonIMEISVPEI OPTIONAL,
		mACRestIndicator [16] MACRestrictionIndicator OPTIONAL
		mACRestIndicator [16] MACRestrictionIndicator OPTIONAL,
		pagingRestrictionIndicator [17] PagingRestrictionIndicator OPTIONAL
		}

		-- See clause 6.2.2.2.3 for details of this structure
		@@ -1277,7 +1278,10 @@ AMFRegistrationType ::= ENUMERATED
		initial(1),
		mobility(2),
		periodic(3),
		emergency(4)
		emergency(4),
		sNPNOnboarding(5),
		disasterMobility(6),
		disasterInitial(7)
		}

		AMFSetID ::= INTEGER (0..1023)
		@@ -1314,7 +1318,8 @@ SMFPDUSessionEstablishment ::= SEQUENCE
		oldPDUSessionID [23] PDUSessionID OPTIONAL,
		handoverState [24] HandoverState OPTIONAL,
		gTPTunnelInfo [25] GTPTunnelInfo OPTIONAL,
		pCCRules [26] PCCRuleSet OPTIONAL
		pCCRules [26] PCCRuleSet OPTIONAL,
		ePSPDNConnectionEstablishment [27] EPSPDNConnectionEstablishment OPTIONAL
		}

		-- See clause 6.2.3.2.3 for details of this structure
		@@ -1336,7 +1341,10 @@ SMFPDUSessionModification ::= SEQUENCE
		servingNetwork [14] SMFServingNetwork OPTIONAL,
		handoverState [15] HandoverState OPTIONAL,
		gTPTunnelInfo [16] GTPTunnelInfo OPTIONAL,
		pCCRules [17] PCCRuleSet OPTIONAL
		pCCRules [17] PCCRuleSet OPTIONAL,
		ePSPDNConnectionModification[18] EPSPDNConnectionModification OPTIONAL,
		uPPathChange [19] UPPathChange OPTIONAL,
		pFDDataForApp [20] PFDDataForApp OPTIONAL
		}

		-- See clause 6.2.3.2.4 for details of this structure
		@@ -1355,7 +1363,8 @@ SMFPDUSessionRelease ::= SEQUENCE
		ePS5GSComboInfo [11] EPS5GSComboInfo OPTIONAL,
		nGAPCause [12] NGAPCauseInt OPTIONAL,
		fiveGMMCause [13] FiveGMMCause OPTIONAL,
		pCCRuleIDs [14] PCCRuleIDSet OPTIONAL
		pCCRuleIDs [14] PCCRuleIDSet OPTIONAL,
		ePSPDNConnectionRelease [15] EPSPDNConnectionRelease OPTIONAL
		}

		-- See clause 6.2.3.2.5 for details of this structure
		@@ -1384,7 +1393,9 @@ SMFStartOfInterceptionWithEstablishedPDUSession ::= SEQUENCE
		uEEPSPDNConnection [21] UEEPSPDNConnection OPTIONAL,
		servingNetwork [22] SMFServingNetwork OPTIONAL,
		gTPTunnelInfo [23] GTPTunnelInfo OPTIONAL,
		pCCRules [24] PCCRuleSet OPTIONAL
		pCCRules [24] PCCRuleSet OPTIONAL,
		ePSStartOfInterceptionWithEstablishedPDNConnection [25] EPSStartOfInterceptionWithEstablishedPDNConnection OPTIONAL,
		pFDDataForApps [26] PFDDataForApps OPTIONAL
		}

		-- See clause 6.2.3.2.6 for details of this structure
		@@ -1485,7 +1496,9 @@ SMFMAPDUSessionModification ::= SEQUENCE
		uEEPSPDNConnection [16] UEEPSPDNConnection OPTIONAL,
		ePS5GSComboInfo [17] EPS5GSComboInfo OPTIONAL,
		handoverState [18] HandoverState OPTIONAL,
		pCCRules [19] PCCRuleSet OPTIONAL
		pCCRules [19] PCCRuleSet OPTIONAL,
		uPPathChange [20] UPPathChange OPTIONAL,
		pFDDataForApp [21] PFDDataForApp OPTIONAL
		}

		-- See clause 6.2.3.2.7.3 for details of this structure
		@@ -1532,7 +1545,8 @@ SMFStartOfInterceptionWithEstablishedMAPDUSession ::= SEQUENCE
		aTSSSContainer [21] ATSSSContainer OPTIONAL,
		ePS5GSComboInfo [22] EPS5GSComboInfo OPTIONAL,
		uEEPSPDNConnection [23] UEEPSPDNConnection OPTIONAL,
		pCCRules [24] PCCRuleSet OPTIONAL
		pCCRules [24] PCCRuleSet OPTIONAL,
		pFDDataForApps [25] PFDDataForApps OPTIONAL
		}

		-- See clause 6.2.3.2.7.5 for details of this structure
		@@ -1713,6 +1727,19 @@ PCCRule ::= SEQUENCE
		eASIPReplaceInfos [18] EASIPReplaceInfos OPTIONAL
		}

		--See clause table 5.6.2.5-1 of TS 29.508 [90] for the details of this structure.
		UPPathChange ::= SEQUENCE
		{
		sourceDNAI [1] DNAI OPTIONAL,
		targetDNAI [2] DNAI OPTIONAL,
		dNAIChangeType [3] DNAIChangeType OPTIONAL,
		sourceUEIPAddr [4] IPAddress OPTIONAL,
		targetUEIPAddr [5] IPAddress OPTIONAL,
		sourceTrafficRouting [6] RouteToLocation OPTIONAL,
		targetTrafficRouting [7] RouteToLocation OPTIONAL,
		mACAddress [8] MACAddress OPTIONAL
		}

		-- See table 5.6.2.14-1 of TS 29.512 [89]
		PCCRuleID ::= UTF8String

		@@ -1848,10 +1875,155 @@ EASServerAddress ::= SEQUENCE
		port [2] PortNumber
		}

		-- ================================
		-- PGW-C + SMF PDNConnection Events
		-- ================================

		EPSPDNConnectionEstablishment ::= SEQUENCE
		{
		ePSSubscriberIDs [1] EPSSubscriberIDs,
		iMSIUnauthenticated [2] IMSIUnauthenticatedIndication OPTIONAL,
		defaultBearerID [3] EPSBearerID,
		gTPTunnelInfo [4] GTPTunnelInfo OPTIONAL,
		pDNConnectionType [5] PDNConnectionType,
		uEEndpoints [6] SEQUENCE OF UEEndpointAddress OPTIONAL,
		non3GPPAccessEndpoint [7] UEEndpointAddress OPTIONAL,
		location [8] Location OPTIONAL,
		additionalLocation [9] Location OPTIONAL,
		aPN [10] APN,
		requestType [11] EPSPDNConnectionRequestType OPTIONAL,
		accessType [12] AccessType OPTIONAL,
		rATType [13] RATType OPTIONAL,
		protocolConfigurationOptions [14] PDNProtocolConfigurationOptions OPTIONAL,
		servingNetwork [15] SMFServingNetwork OPTIONAL,
		sMPDUDNRequest [16] SMPDUDNRequest OPTIONAL,
		bearerContextsCreated [17] SEQUENCE OF EPSBearerContextCreated,
		bearerContextsMarkedForRemoval [18] SEQUENCE OF EPSBearerContextForRemoval OPTIONAL,
		indicationFlags [19] PDNConnectionIndicationFlags OPTIONAL,
		handoverIndication [20] PDNHandoverIndication OPTIONAL,
		nBIFOMSupport [21] PDNNBIFOMSupport OPTIONAL,
		fiveGSInterworkingInfo [22] FiveGSInterworkingInfo OPTIONAL,
		cSRMFI [23] CSRMFI OPTIONAL,
		restorationOfPDNConnectionsSupport [24] RestorationOfPDNConnectionsSupport OPTIONAL,
		pGWChangeIndication [25] PGWChangeIndication OPTIONAL,
		pGWRNSI [26] PGWRNSI OPTIONAL
		}

		EPSPDNConnectionModification ::= SEQUENCE
		{
		ePSSubscriberIDs [1] EPSSubscriberIDs,
		iMSIUnauthenticated [2] IMSIUnauthenticatedIndication OPTIONAL,
		defaultBearerID [3] EPSBearerID,
		gTPTunnelInfo [4] GTPTunnelInfo OPTIONAL,
		pDNConnectionType [5] PDNConnectionType,
		uEEndpoints [6] SEQUENCE OF UEEndpointAddress OPTIONAL,
		non3GPPAccessEndpoint [7] UEEndpointAddress OPTIONAL,
		location [8] Location OPTIONAL,
		additionalLocation [9] Location OPTIONAL,
		aPN [10] APN,
		requestType [11] EPSPDNConnectionRequestType OPTIONAL,
		accessType [12] AccessType OPTIONAL,
		rATType [13] RATType OPTIONAL,
		protocolConfigurationOptions [14] PDNProtocolConfigurationOptions OPTIONAL,
		servingNetwork [15] SMFServingNetwork OPTIONAL,
		sMPDUDNRequest [16] SMPDUDNRequest OPTIONAL,
		bearerContextsCreated [17] SEQUENCE OF EPSBearerContextCreated OPTIONAL,
		bearerConcextsModified [18] SEQUENCE OF EPSBearerContextModified,
		bearerContextsMarkedForRemoval [19] SEQUENCE OF EPSBearerContextForRemoval OPTIONAL,
		bearersDeleted [20] SEQUENCE OF EPSBearersDeleted OPTIONAL,
		indicationFlags [21] PDNConnectionIndicationFlags OPTIONAL,
		handoverIndication [22] PDNHandoverIndication OPTIONAL,
		nBIFOMSupport [23] PDNNBIFOMSupport OPTIONAL,
		fiveGSInterworkingInfo [24] FiveGSInterworkingInfo OPTIONAL,
		cSRMFI [25] CSRMFI OPTIONAL,
		restorationOfPDNConnectionsSupport [26] RestorationOfPDNConnectionsSupport OPTIONAL,
		pGWChangeIndication [27] PGWChangeIndication OPTIONAL,
		pGWRNSI [28] PGWRNSI OPTIONAL
		}

		EPSPDNConnectionRelease ::= SEQUENCE
		{
		ePSSubscriberIDs [1] EPSSubscriberIDs,
		iMSIUnauthenticated [2] IMSIUnauthenticatedIndication OPTIONAL,
		defaultBearerID [3] EPSBearerID,
		location [4] Location OPTIONAL,
		gTPTunnelInfo [5] GTPTunnelInfo OPTIONAL,
		rANNASCause [6] EPSRANNASCause OPTIONAL,
		pDNConnectionType [7] PDNConnectionType,
		indicationFlags [8] PDNConnectionIndicationFlags OPTIONAL,
		scopeIndication [9] EPSPDNConnectionReleaseScopeIndication OPTIONAL,
		bearersDeleted [10] SEQUENCE OF EPSBearersDeleted OPTIONAL
		}

		EPSStartOfInterceptionWithEstablishedPDNConnection ::= SEQUENCE
		{
		ePSSubscriberIDs [1] EPSSubscriberIDs,
		iMSIUnauthenticated [2] IMSIUnauthenticatedIndication OPTIONAL,
		defaultBearerID [3] EPSBearerID,
		gTPTunnelInfo [4] GTPTunnelInfo OPTIONAL,
		pDNConnectionType [5] PDNConnectionType,
		uEEndpoints [6] SEQUENCE OF UEEndpointAddress OPTIONAL,
		non3GPPAccessEndpoint [7] UEEndpointAddress OPTIONAL,
		location [8] Location OPTIONAL,
		additionalLocation [9] Location OPTIONAL,
		aPN [10] APN,
		requestType [11] EPSPDNConnectionRequestType OPTIONAL,
		accessType [12] AccessType OPTIONAL,
		rATType [13] RATType OPTIONAL,
		protocolConfigurationOptions [14] PDNProtocolConfigurationOptions OPTIONAL,
		servingNetwork [15] SMFServingNetwork OPTIONAL,
		sMPDUDNRequest [16] SMPDUDNRequest OPTIONAL,
		bearerContexts [17] SEQUENCE OF EPSBearerContext
		}

		PFDDataForApps ::= SET OF PFDDataForApp

		PFDDataForApp ::= SEQUENCE
		{
		aPPId [1] UTF8String,
		pFDs [2] PFDs
		}

		PFDs ::= SET OF PFD

		-- See table 5.6.2.5-1 of TS 29.551 [94]
		PFD ::= SEQUENCE
		{
		pFDId [1] UTF8String,
		pFDFlowDescriptions [2] PFDFlowDescriptions,
		urls [3] PFDURLs,
		domainNames [4] DomainNames,
		dnProtocol [5] DnProtocol
		}

		PFDURLs ::= SET OF UTF8String

		PFDFlowDescriptions ::= SET OF PFDFlowDescription

		DomainNames ::= SET OF UTF8String

		PFDFlowDescription ::= SEQUENCE
		{
		nextLayerProtocol [1] NextLayerProtocol,
		serverIPAddress [2] IPAddress,
		serverPortNumber [3] PortNumber
		}

		-- See table 5.14.2.2.4-1 of TS 29.122 [63]
		DnProtocol ::= ENUMERATED
		{
		dnsQname(1),
		tlsSni(2),
		tlsSan(3),
		tlsScn(4)
		}

		-- ======================
		-- PGW-C + SMF Parameters
		-- ======================

		CSRMFI ::= BOOLEAN

		EPS5GSComboInfo ::= SEQUENCE
		{
		ePSInterworkingIndication [1] EPSInterworkingIndication,
		@@ -1890,13 +2062,154 @@ EPSBearers ::= SEQUENCE
		qCI [3] QCI
		}

		EPSBearerContext ::= SEQUENCE
		{
		ePSBearerID [1] EPSBearerID,
		uPGTPTunnelInfo [2] GTPTunnelInfo,
		bearerQOS [3] EPSBearerQOS
		}

		EPSBearerContextCreated ::= SEQUENCE
		{
		ePSBearerID [1] EPSBearerID,
		cause [2] EPSBearerCreationCauseValue,
		gTPTunnelInfo [3] GTPTunnelInfo OPTIONAL,
		bearerQOS [4] EPSBearerQOS OPTIONAL,
		protocolConfigurationOptions [5] PDNProtocolConfigurationOptions OPTIONAL
		}

		EPSBearerContextModified ::= SEQUENCE
		{
		ePSBearerID [1] EPSBearerID,
		cause [2] EPSBearerModificationCauseValue,
		gTPTunnelInfo [3] GTPTunnelInfo OPTIONAL,
		bearerQOS [4] EPSBearerQOS OPTIONAL,
		protocolConfigurationOptions [5] PDNProtocolConfigurationOptions OPTIONAL
		}

		EPSBearersDeleted ::= SEQUENCE
		{
		linkedEPSBearerID [1] EPSBearerID OPTIONAL,
		ePSBearerIDs [2] SEQUENCE OF EPSBearerID OPTIONAL,
		protocolConfigurationOptions [3] PDNProtocolConfigurationOptions OPTIONAL,
		cause [4] EPSBearerDeletionCauseValue OPTIONAL,
		deleteBearerResponse [5] EPSDeleteBearerResponse
		}

		EPSDeleteBearerResponse ::= SEQUENCE
		{
		cause [1] EPSBearerDeletionCauseValue,
		linkedEPSBearerID [2] EPSBearerID OPTIONAL,
		bearerContexts [3] SEQUENCE OF EPSDeleteBearerContext OPTIONAL,
		protocolConfigurationOptions [4] PDNProtocolConfigurationOptions OPTIONAL
		}

		EPSDeleteBearerContext ::= SEQUENCE
		{
		cause [1] EPSBearerDeletionCauseValue,
		ePSBearerID [2] EPSBearerID,
		protocolConfigurationOptions [3] PDNProtocolConfigurationOptions OPTIONAL,
		rANNASCause [4] EPSRANNASCause OPTIONAL
		}

		EPSBearerContextForRemoval ::= SEQUENCE
		{
		ePSBearerID [1] EPSBearerID,
		cause [2] EPSBearerRemovalCauseValue
		}

		EPSBearerCreationCauseValue ::= INTEGER (0..255)

		EPSBearerDeletionCauseValue ::= INTEGER (0..255)

		EPSBearerModificationCauseValue ::= INTEGER (0..255)

		EPSBearerRemovalCauseValue ::= INTEGER (0..255)

		EPSBearerQOS ::= SEQUENCE
		{
		qCI [1] QCI OPTIONAL,
		maximumUplinkBitRate [2] BitrateBinKBPS OPTIONAL,
		maximumDownlinkBitRate [3] BitrateBinKBPS OPTIONAL,
		guaranteedUplinkBitRate [4] BitrateBinKBPS OPTIONAL,
		guaranteedDownlinkBitRate [5] BitrateBinKBPS OPTIONAL,
		priorityLevel [6] EPSQOSPriority OPTIONAL
		}

		EPSRANNASCause ::= OCTET STRING

		EPSQOSPriority ::= INTEGER (1..15)

		BitrateBinKBPS ::= OCTET STRING

		EPSGTPTunnels ::= SEQUENCE
		{
		controlPlaneSenderFTEID [1] FTEID OPTIONAL,
		controlPlanePGWS5S8FTEID [2] FTEID OPTIONAL,
		s1UeNodeBFTEID [3] FTEID OPTIONAL,
		s5S8SGWFTEID [4] FTEID OPTIONAL,
		s5S8PGWFTEID [5] FTEID OPTIONAL,
		s2bUePDGFTEID [6] FTEID OPTIONAL,
		s2aUePDGFTEID [7] FTEID OPTIONAL
		}

		EPSPDNConnectionRequestType ::= ENUMERATED
		{
		initialRequest(1),
		handover(2),
		rLOS(3),
		emergency(4),
		handoverOfEmergencyBearerServices(5),
		reserved(6)
		}

		EPSPDNConnectionReleaseScopeIndication ::= BOOLEAN

		FiveGSInterworkingInfo ::= SEQUENCE
		{
		fiveGSInterworkingIndicator [1] FiveGSInterworkingIndicator,
		fiveGSInterworkingWithoutN26 [2] FiveGSInterworkingWithoutN26,
		fiveGCNotRestrictedSupport [3] FiveGCNotRestrictedSupport
		}

		FiveGSInterworkingIndicator ::= BOOLEAN

		FiveGSInterworkingWithoutN26 ::= BOOLEAN

		FiveGCNotRestrictedSupport ::= BOOLEAN

		PDNConnectionIndicationFlags ::= OCTET STRING

		PDNHandoverIndication ::= BOOLEAN

		PDNNBIFOMSupport ::= BOOLEAN

		PDNProtocolConfigurationOptions ::= SEQUENCE
		{
		requestPCO [1] PDNPCO OPTIONAL,
		requestAPCO [2] PDNPCO OPTIONAL,
		requestEPCO [3] PDNPCO OPTIONAL,
		responsePCO [4] PDNPCO OPTIONAL,
		responseAPCO [5] PDNPCO OPTIONAL,
		responseEPCO [6] PDNPCO OPTIONAL
		}

		PDNPCO ::= OCTET STRING

		PGWChangeIndication ::= BOOLEAN

		PGWRNSI ::= BOOLEAN

		QCI ::= INTEGER (0..255)

		GTPTunnelInfo ::= SEQUENCE
		{
		fiveGSGTPTunnels [1] FiveGSGTPTunnels OPTIONAL
		fiveGSGTPTunnels [1] FiveGSGTPTunnels OPTIONAL,
		ePSGTPTunnels [2] EPSGTPTunnels OPTIONAL
		}

		RestorationOfPDNConnectionsSupport ::= BOOLEAN

		-- ==================
		-- 5G UPF definitions
		-- ==================
		@@ -1936,7 +2249,8 @@ UDMServingSystemMessage ::= SEQUENCE
		gUMMEI [5] GUMMEI OPTIONAL,
		pLMNID [6] PLMNID OPTIONAL,
		servingSystemMethod [7] UDMServingSystemMethod,
		serviceID [8] ServiceID OPTIONAL
		serviceID [8] ServiceID OPTIONAL,
		roamingIndicator [9] RoamingIndicator OPTIONAL
		}

		UDMSubscriberRecordChangeMessage ::= SEQUENCE
		@@ -2095,6 +2409,9 @@ UDMInvalidParameters ::= SEQUENCE
		parameter [1] UTF8String OPTIONAL,
		reason [2] UTF8String OPTIONAL
		}

		RoamingIndicator ::= BOOLEAN

		-- ===================
		-- 5G SMSF definitions
		-- ===================
		@@ -3426,7 +3743,8 @@ PDSummaryReport ::= SEQUENCE
		firstPacketTimestamp [10] Timestamp,
		lastPacketTimestamp [11] Timestamp,
		packetCount [12] INTEGER,
		byteCount [13] INTEGER
		byteCount [13] INTEGER,
		perSessionTrigger [14] BOOLEAN
		}

		-- ====================
		@@ -3842,6 +4160,8 @@ IMPU ::= CHOICE

		IMSI ::= NumericString (SIZE(6..15))

		IMSIUnauthenticatedIndication ::= BOOLEAN

		Initiator ::= ENUMERATED
		{
		uE(1),
		@@ -3898,17 +4218,29 @@ NonLocalID ::= ENUMERATED

		NonIMEISVPEI ::= CHOICE
		{
		mACAddress [1] MACAddress
		mACAddress [1] MACAddress,
		eUI64 [2] EUI64
		}

		NSSAI ::= SEQUENCE OF SNSSAI

		PagingRestrictionIndicator ::= OCTET STRING (SIZE(1..33))

		PLMNID ::= SEQUENCE
		{
		mCC [1] MCC,
		mNC [2] MNC
		}

		PDNConnectionType ::= ENUMERATED
		{
		iPv4(1),
		iPv6(2),
		iPv4v6(3),
		nonIP(4),
		ethernet(5)
		}

		PDUSessionID ::= INTEGER (0..255)

		PDUSessionType ::= ENUMERATED
		@@ -4057,7 +4389,14 @@ TargetIdentifier ::= CHOICE
		nAI [7] NAI,
		iPv4Address [8] IPv4Address,
		iPv6Address [9] IPv6Address,
		ethernetAddress [10] MACAddress
		ethernetAddress [10] MACAddress,
		iMPU [11] IMPU,
		iMPI [12] IMPI,
		e164Number [13] E164Number,
		emailAddress [14] EmailAddress,
		mCPTTID [15] UTF8String,
		instanceIdentifierURN [16] UTF8String,
		pTCChatGroupID [17] PTCChatGroupID
		}

		TargetIdentifierProvenance ::= ENUMERATED

33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd

+28 −5

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:r17:v3"
		xmlns="urn:3GPP:ns:li:3GPPIdentityExtensions:r17:v4"
		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:r17:v3"
		targetNamespace="urn:3GPP:ns:li:3GPPIdentityExtensions:r17:v4"
		elementFormDefault="qualified">

		<xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>
		@@ -89,6 +89,7 @@
		<xs:element name="AssociationEndTime" type="common:QualifiedMicrosecondDateTime" minOccurs="0"/>
		<xs:element name="FiveGSTAIList" type="FiveGSTAIList" minOccurs="0"/>
		<xs:element name="GPSI" type="GPSI" minOccurs="0"/>
		<xs:element name="NCGI" type="NCGI" minOccurs="0"/>
		</xs:sequence>
		</xs:complexType>

		@@ -137,6 +138,28 @@
		</xs:choice>
		</xs:complexType>

		<xs:complexType name="NCGI">
		<xs:sequence>
		<xs:element name="PLMNID" type="PLMNID"/>
		<xs:element name="NRCellID" type="NRCellID"/>
		<xs:element name="NID" type="NID" minOccurs="0"/>
		<xs:element name="NCGITime" type="common:QualifiedMicrosecondDateTime"/>
		</xs:sequence>
		</xs:complexType>

		<xs:complexType name="PLMNID">
		<xs:sequence>
		<xs:element name="MCC" type="MCC"/>
		<xs:element name="MNC" type="MNC"/>
		</xs:sequence>
		</xs:complexType>

		<xs:simpleType name="NRCellID">
		<xs:restriction base="xs:string">
		<xs:pattern value="([A-Fa-f0-9]{9})"></xs:pattern>
		</xs:restriction>
		</xs:simpleType>

		<xs:simpleType name="MCC">
		<xs:restriction base="xs:string">
		<xs:pattern value="[0-9]{3}"></xs:pattern>

33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd

+15 −2

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:v3"
		xmlns="urn:3GPP:ns:li:3GPPX1Extensions:r17:v4"
		xmlns:common="http://uri.etsi.org/03280/common/2017/07"
		targetNamespace="urn:3GPP:ns:li:3GPPX1Extensions:r17:v3"
		targetNamespace="urn:3GPP:ns:li:3GPPX1Extensions:r17:v4"
		elementFormDefault="qualified">

		<xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
		@@ -86,6 +86,7 @@
		<xs:element name="SMSFExtensions" type="SMSFProvisioningExtensions"></xs:element>
		<xs:element name="IdentifierAssociation" type="IdentifierAssociationExtensions"></xs:element>
		<xs:element name="SDP" type="SDP"></xs:element>
		<xs:element name="STIRSHAKENProvisioning" type="STIRSHAKENTargetProvisioningExtensions"></xs:element>
		</xs:choice>
		</xs:complexType>

		@@ -196,6 +197,7 @@
		<xs:complexType name="PDSRParameters">
		<xs:sequence>
		<xs:element name="PDSRTriggerType" type="PDSRTriggerType" minOccurs="1" maxOccurs="unbounded"></xs:element>
		<xs:element name="useSessionTriggers" type="xs:boolean" minOccurs="0" ></xs:element>
		</xs:sequence>
		</xs:complexType>

		@@ -347,4 +349,15 @@
		</xs:restriction>
		</xs:simpleType>

		<xs:complexType name="STIRSHAKENTargetProvisioningExtensions">
		<xs:sequence>
		<xs:element name="ReportDiversionPASSporTInfo" type="ReportDiversionPASSporTInfo"></xs:element>
		</xs:sequence>
		</xs:complexType>

		<xs:simpleType name="ReportDiversionPASSporTInfo">
		<xs:restriction base="xs:boolean">
		</xs:restriction>
		</xs:simpleType>

		</xs:schema>