Fixing merge conflicts (42218818) · Commits · SA3 / SA3 LI

33128/r17/TS33128Payloads.asn

+187 −0

Original line number	Diff line number	Diff line
		@@ -1308,11 +1308,15 @@ SMFPDUSessionEstablishment ::= SEQUENCE
		sMPDUDNRequest [18] SMPDUDNRequest OPTIONAL,
		uEEPSPDNConnection [19] UEEPSPDNConnection OPTIONAL,
		ePS5GSComboInfo [20] EPS5GSComboInfo OPTIONAL,
		<<<<<<< HEAD
		selectedDNN [21] DNN OPTIONAL,
		servingNetwork [22] SMFServingNetwork OPTIONAL,
		oldPDUSessionID [23] PDUSessionID OPTIONAL,
		handoverState [24] HandoverState OPTIONAL,
		gTPTunnelInfo [25] GTPTunnelInfo
		=======
		pCCRules [21] PCCRuleSet OPTIONAL
		>>>>>>> cr/33128/0352_alt
		}

		-- See clause 6.2.3.2.3 for details of this structure
		@@ -1330,10 +1334,14 @@ SMFPDUSessionModification ::= SEQUENCE
		rATType [10] RATType OPTIONAL,
		pDUSessionID [11] PDUSessionID OPTIONAL,
		ePS5GSComboInfo [12] EPS5GSComboInfo OPTIONAL,
		<<<<<<< HEAD
		uEEndpoint [13] UEEndpointAddress OPTIONAL,
		servingNetwork [14] SMFServingNetwork OPTIONAL,
		handoverState [15] HandoverState OPTIONAL,
		gTPTunnelInfo [16] GTPTunnelInfo
		=======
		pCCRules [13] PCCRuleSet OPTIONAL
		>>>>>>> cr/33128/0352_alt
		}

		-- See clause 6.2.3.2.4 for details of this structure
		@@ -1350,8 +1358,12 @@ SMFPDUSessionRelease ::= SEQUENCE
		location [9] Location OPTIONAL,
		cause [10] SMFErrorCodes OPTIONAL,
		ePS5GSComboInfo [11] EPS5GSComboInfo OPTIONAL,
		<<<<<<< HEAD
		nGAPCause [12] NGAPCauseInt OPTIONAL,
		fiveGMMCause [13] FiveGMMCause OPTIONAL
		=======
		pCCRuleIDs [12] PCCRuleIDSet OPTIONAL
		>>>>>>> cr/33128/0352_alt
		}

		-- See clause 6.2.3.2.5 for details of this structure
		@@ -1377,9 +1389,13 @@ SMFStartOfInterceptionWithEstablishedPDUSession ::= SEQUENCE
		sMPDUDNRequest [18] SMPDUDNRequest OPTIONAL,
		timeOfSessionEstablishment [19] Timestamp OPTIONAL,
		ePS5GSComboInfo [20] EPS5GSComboInfo OPTIONAL,
		<<<<<<< HEAD
		uEEPSPDNConnection [21] UEEPSPDNConnection OPTIONAL,
		servingNetwork [22] SMFServingNetwork OPTIONAL,
		gTPTunnelInfo [23] GTPTunnelInfo
		=======
		pCCRules [21] PCCRuleSet OPTIONAL
		>>>>>>> cr/33128/0352_alt
		}

		-- See clause 6.2.3.2.6 for details of this structure
		@@ -1452,10 +1468,14 @@ SMFMAPDUSessionEstablishment ::= SEQUENCE
		ePSPDNCnxInfo [19] SMFEPSPDNCnxInfo OPTIONAL,
		mAAcceptedIndication [20] SMFMAAcceptedIndication,
		aTSSSContainer [21] ATSSSContainer OPTIONAL,
		<<<<<<< HEAD
		uEEPSPDNConnection [22] UEEPSPDNConnection OPTIONAL,
		ePS5GSComboInfo [23] EPS5GSComboInfo OPTIONAL,
		selectedDNN [24] DNN OPTIONAL,
		handoverState [25] HandoverState OPTIONAL
		=======
		pCCRules [22] PCCRuleSet OPTIONAL
		>>>>>>> cr/33128/0352_alt
		}

		-- See clause 6.2.3.2.7.2 for details of this structure
		@@ -1476,9 +1496,13 @@ SMFMAPDUSessionModification ::= SEQUENCE
		ePSPDNCnxInfo [13] SMFEPSPDNCnxInfo OPTIONAL,
		mAAcceptedIndication [14] SMFMAAcceptedIndication,
		aTSSSContainer [15] ATSSSContainer OPTIONAL,
		<<<<<<< HEAD
		uEEPSPDNConnection [16] UEEPSPDNConnection OPTIONAL,
		ePS5GSComboInfo [17] EPS5GSComboInfo OPTIONAL,
		handoverState [18] HandoverState OPTIONAL
		=======
		pCCRules [16] PCCRuleSet OPTIONAL
		>>>>>>> cr/33128/0352_alt
		}

		-- See clause 6.2.3.2.7.3 for details of this structure
		@@ -1494,8 +1518,12 @@ SMFMAPDUSessionRelease ::= SEQUENCE
		downlinkVolume [8] INTEGER OPTIONAL,
		location [9] Location OPTIONAL,
		cause [10] SMFErrorCodes OPTIONAL,
		<<<<<<< HEAD
		nGAPCause [11] NGAPCauseInt OPTIONAL,
		fiveGMMCause [12] FiveGMMCause OPTIONAL
		=======
		pCCRuleIDs [11] PCCRuleIDSet OPTIONAL
		>>>>>>> cr/33128/0352_alt
		}

		-- See clause 6.2.3.2.7.4 for details of this structure
		@@ -1522,8 +1550,12 @@ SMFStartOfInterceptionWithEstablishedMAPDUSession ::= SEQUENCE
		ePSPDNCnxInfo [19] SMFEPSPDNCnxInfo OPTIONAL,
		mAAcceptedIndication [20] SMFMAAcceptedIndication,
		aTSSSContainer [21] ATSSSContainer OPTIONAL,
		<<<<<<< HEAD
		ePS5GSComboInfo [22] EPS5GSComboInfo OPTIONAL,
		uEEPSPDNConnection [23] UEEPSPDNConnection OPTIONAL
		=======
		pCCRules [22] PCCRuleSet OPTIONAL
		>>>>>>> cr/33128/0352_alt
		}

		-- See clause 6.2.3.2.7.5 for details of this structure
		@@ -1653,6 +1685,7 @@ RequestIndication ::= ENUMERATED
		rELDUETO5GANREQUEST(7)
		}

		<<<<<<< HEAD
		QOSFlowTunnelInformation ::= SEQUENCE
		{
		uPTunnelInformation [1] FTEID,
		@@ -1682,6 +1715,160 @@ QOSFlowProfile ::= SEQUENCE
		}

		QOSRules ::= OCTET STRING
		=======
		--see Clauses 5.6.2.6-1 and 5.6.2.9-1 of TS 29.512[YY], clause table 5.6.2.5-1 of TS 29.508[ZZ] for the details of this structure.
		PCCRule ::= SEQUENCE
		{
		pCCRuleID [1] PCCRuleID OPTIONAL,
		appId [2] UTF8String OPTIONAL,
		flowInfos [3] SET OF FlowInformation OPTIONAL,
		appReloc [4] BOOLEAN OPTIONAL,
		simConnInd [5] BOOLEAN OPTIONAL,
		simConnTerm [6] INTEGER OPTIONAL,
		maxAllowedUpLat [7] INTEGER OPTIONAL,
		trafficRoutes [8] SET OF RouteToLocation,
		trafficSteeringPolIdDl [9] UTF8String OPTIONAL,
		trafficSteeringPolIdUl [10] UTF8String OPTIONAL,
		sourceDNAI [11] DNAI OPTIONAL,
		targetDNAI [12] DNAI OPTIONAL,
		dNAIChangeType [13] DNAIChangeType OPTIONAL,
		sourceUEIPAddr [14] IPAddress OPTIONAL,
		targetUEIPAddr [15] IPAddress OPTIONAL,
		sourceTrafficRouting [16] RouteToLocation OPTIONAL,
		targetTrafficRouting [17] RouteToLocation OPTIONAL,
		eASIPReplaceInfos [18] EASIPReplaceInfos OPTIONAL
		}

		-- see Table 5.6.2.14-1 of TS 29.512[XX].
		PCCRuleID ::= UTF8String

		PCCRuleSet ::= SET OF PCCRule
		PCCRuleIDSet ::= SET OF PCCRuleID

		-- see table 5.6.2.14 of TS 29.512[XX].
		FlowInformation ::= SEQUENCE
		{
		flowDescription [1] FlowDescription OPTIONAL,
		ethFlowDescription [2] EthFlowDescription OPTIONAL,
		tosTrafficClass [3] OCTET STRING (SIZE(2)) OPTIONAL,
		spi [4] OCTET STRING (SIZE(4)) OPTIONAL,
		flowLabel [5] OCTET STRING (SIZE(3)) OPTIONAL,
		flowDirection [6] FlowDirection OPTIONAL
		}

		-- see table 5.6.2.14 of TS 29.512[XX].
		FlowDescription ::= SEQUENCE
		{
		sourceIPAddress [1] IPAddressOrRangeOrAny,
		destinationIPAddress [2] IPAddressOrRangeOrAny,
		sourcePortNumber [3] PortNumber OPTIONAL,
		destinationPortNumber [4] PortNumber OPTIONAL,
		protocol [5] NextLayerProtocolOrAny
		}

		IPAddressOrRangeOrAny ::= CHOICE
		{
		iPAddress [1] IPAddress,
		ipAddressRange [2] IPMask,
		anyIPAddress [3] AnyIPAddress
		}

		IPMask ::= SEQUENCE
		{
		fromIPAddress [1] IPAddress,
		toIPAddress [2] IPAddress
		}

		AnyIPAddress ::= ENUMERATED
		{
		any(1)
		}

		NextLayerProtocolOrAny ::= CHOICE
		{
		nextLayerProtocol [1] NextLayerProtocol,
		anyNextLayerProtocol [2] AnyNextLayerProtocol
		}

		AnyNextLayerProtocol ::= ENUMERATED
		{
		ip(1)
		}

		-- see Table 5.6.2.17-1 of TS 29.514[AA].
		EthFlowDescription ::= SEQUENCE
		{
		destMacAddress [1] MACAddress OPTIONAL,
		ethType [2] OCTET STRING (SIZE(2)),
		fDesc [3] FlowDescription OPTIONAL,
		fDir [4] FDir OPTIONAL,
		sourceMacAddress [5] MACAddress OPTIONAL,
		vlanTags [6] SET OF VLANTag,
		srcMacAddrEnd [7] MACAddress OPTIONAL,
		destMacAddrEnd [8] MACAddress OPTIONAL
		}

		-- see Table 5.6.2.17-1 of TS 29.514[AA].
		FDir ::= ENUMERATED
		{
		downlink(1)
		}

		-- see Table 5.6.2.17-1 of TS 29.514[AA].
		VLANTag ::= SEQUENCE
		{
		priority [1] BIT STRING (SIZE(3)),
		cFI [2] BIT STRING (SIZE(1)),
		vLANID [3] BIT STRING (SIZE(12))
		}

		-- see table 5.6.2.14 of TS 29.512[XX].
		FlowDirection ::= ENUMERATED
		{
		downlinkOnly(1),
		uplinkOnly(2),
		dowlinkAndUplink(3)
		}

		-- see table 5.4.2.1 of TS 29.571[17].
		DNAIChangeType ::= ENUMERATED
		{
		early(1),
		earlyAndLate(2),
		late(3)
		}

		-- see table 5.6.2.15 of TS 29.571[17].
		RouteToLocation ::= SEQUENCE
		{
		dNAI [1] DNAI,
		routeInfo [2] RouteInfo
		}

		-- see table 5.4.2.1 of TS 29.571[17].
		DNAI ::= UTF8String

		-- see table 5.4.4.16 of TS 29.571[17].
		RouteInfo ::= SEQUENCE
		{
		iPAddressTunnelEndpoint [1] IPAddress,
		uDPPortNumberTunnelEndpoint [2] PortNumber
		}

		-- see 4.1.4.2 of TS 29.512[YY]
		EASIPReplaceInfos ::= SEQUENCE
		{
		sourceEASAddress [1] EASServerAddress,
		targetEASAddress [2] EASServerAddress
		}

		-- see 4.1.4.2 of TS 29.512[YY]
		EASServerAddress ::= SEQUENCE
		{
		iPAddress [1] IPAddress,
		port [2] PortNumber
		}
		>>>>>>> cr/33128/0352_alt

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