Commit e8880aa9 authored by Robert Tornkvist's avatar Robert Tornkvist
Browse files

Merge branch 'Integration_Rel19_SA5_162_CH_ASN' into... 

Merge branch 'Integration_Rel19_SA5_162_CH_ASN' into '32.298_Rel19_CR1051_Correction_of_satellite_ProSe_and_SMS_information'

# Conflicts:
#   ASN/TS32298_CHFChargingDataTypes.asn
parents 89e9efca f5e6a580

ASN/TS32298_CHFChargingDataTypes.asn

+59 −8
Original line number Diff line number Diff line
@@ -176,7 +176,8 @@ ChargingRecord ::= SET 
	interCHFInformation							[44] InterCHFInformation OPTIONAL,

	nSSAAChargingInformation					[45] NSSAAChargingInformation OPTIONAL,

	rangingSLChargingInformation				[46] RangingSLChargingInformation OPTIONAL,

	lCSInformation								[47] LCSInformation OPTIONAL

	lCSInformation								[47] LCSInformation OPTIONAL,

	networkSharingChargingInformation			[48] NetworkSharingChargingInformation OPTIONAL



}
@@ -241,8 +242,8 @@ PDUSessionChargingInformation ::= SET 
	fiveGSBridgeInformation					[51] FiveGSBridgeInformation OPTIONAL,

	fiveGMulticastService					[52] FiveGMulticastService OPTIONAL,

	satelliteAccessIndicator				[53] BOOLEAN OPTIONAL,

	satelliteBackhaulInformation			[54] SatelliteBackhaulInformation OPTIONAL



	satelliteBackhaulInformation			[54] SatelliteBackhaulInformation OPTIONAL,

	userDisasterRoamingInd					[55] BOOLEAN OPTIONAL



}
@@ -361,7 +362,8 @@ RegistrationChargingInformation ::= SET 
	aMFIdentifier						[24] AMFID OPTIONAL,

	cAGIDList							[25] SEQUENCE OF CagId OPTIONAL,

	alternativeNSSAIMap					[26] SEQUENCE OF AlternativeNSSAIMap OPTIONAL,

	satelliteAccessIndicator			[27] BOOLEAN OPTIONAL	

	satelliteAccessIndicator			[27] BOOLEAN OPTIONAL,

	userDisasterRoamingInd				[28] BOOLEAN OPTIONAL



}
@@ -439,6 +441,15 @@ NSPAChargingInformation ::= SET 
	singelNSSAI					[0] SingleNSSAI

}



--

-- Network Sharing charging Information

--



NetworkSharingChargingInformation			::= SET

{

	plmnId						[0] PLMN-Id,

	singelNSSAI					[1] SingleNSSAI OPTIONAL

}



--

-- NSM charging Information
@@ -544,6 +555,7 @@ IMSChargingInformation ::= SET 
	tadIdentifier							[56] TADIdentifier OPTIONAL,

	feIdentifierList						[57] FEIdentifierList OPTIONAL,

	imsDCAppInfo							[58] IMSDCAppInfo OPTIONAL,

	mediaResource							[59] MediaResource OPTIONAL,

	satelliteIDList							[110] SEQUENCE OF SatelliteID OPTIONAL

}
@@ -618,7 +630,12 @@ ProseChargingInformation ::= SET 
	proseDestinationLayer2ID				[30] OCTET STRING OPTIONAL,

	pFIContainerInformation					[31] SEQUENCE OF PFIContainerInformation OPTIONAL,

	transmissionDataContainer				[32] SEQUENCE OF ChangeOfProSeCondition OPTIONAL,

	receptionDataContainer					[33] SEQUENCE OF ChangeOfProSeCondition OPTIONAL

	receptionDataContainer					[33] SEQUENCE OF ChangeOfProSeCondition OPTIONAL,

	hopCount					            [34] INTEGER OPTIONAL,

	intermediateRelayInformationContainer	[35] SEQUENCE OF IntermeidateRelayInformation OPTIONAL,

	proSeUEtoUERelayUEID					[36] UTF8String OPTIONAL,

	proSeUEtoUETargetEndUEIPAddress			[37] IPAddress OPTIONAL		





}
@@ -869,7 +886,11 @@ AuthorizedQoSInformation ::= SEQUENCE 
	averWindow			[4] INTEGER OPTIONAL,

	maxDataBurstVol		[5] INTEGER OPTIONAL

}



AvatarMedia	::= SEQUENCE

{

	resourceURL								[0] UTF8String OPTIONAL,

	mediaProcessingSpecification			[1] UTF8String OPTIONAL

}

-- 

-- B

--
@@ -1246,6 +1267,13 @@ InternalGroupIdentifier ::= UTF8String 
-- See 3GPP TS 29.571 [249] for details

-- 



IntermeidateRelayInformation	::= SEQUENCE

{

	intermediateRelayIPAddress				[0] IPAddress OPTIONAL,

	proSeUEtoNetworkIntermediateRelayUEID	[1] UTF8String OPTIONAL



}



-- 

-- K

--
@@ -1440,7 +1468,19 @@ MAPDUSteeringMode ::= SEQUENCE 
	prioAcc					[4] AccessType OPTIONAL



}

MediaResource	::= SEQUENCE

{

	mediaID						[0] UTF8String,

	mediaResourceCapability		[1] MediaResourceType,

	avatarMedia					[2] AvatarMedia OPTIONAL

}



MediaResourceType 		::= ENUMERATED

{

	dc 			(0),

	audio		(1),

	video		(2)

}



MICOModeIndication 		::= ENUMERATED

{
@@ -1566,6 +1606,14 @@ NcgiTai ::= SEQUENCE 
	cellList 	[1] SEQUENCE OF Ncgi

}



NetworkSharingContainerInformation		::= SEQUENCE

{

	uplinkVolume					[0] INTEGER OPTIONAL,

	downlinkVolume					[1] INTEGER OPTIONAL,

	numberOfPDUSessionsReq			[2] INTEGER OPTIONAL,

	numberOfPDUSessionsSuccess		[3] INTEGER OPTIONAL

}



NetworkSliceEE 		::= SEQUENCE

{

	networkSliceType			[1] NetworkSliceType OPTIONAL,
@@ -1697,6 +1745,7 @@ NetworkFunctionality ::= ENUMERATED 
	mB-SMF			(22),

	aIOTF			(23)

	-- AIOTF is applicable only as API Target NF in NEF charging

	nWDAF			(24)

}



NgApCause	::= SEQUENCE
@@ -1751,7 +1800,8 @@ NSPAContainerInformation ::= SEQUENCE 
	downlinkThroughput					[11] Throughput OPTIONAL,

	maximumPacketLossRateUL				[12] INTEGER OPTIONAL,

	maximumPacketLossRateDL				[13] INTEGER OPTIONAL,

	estimatedEnergyConsumption			[14] INTEGER OPTIONAL

	estimatedEnergyConsumption			[14] INTEGER OPTIONAL,

	sourceNFIdentification				[15] NetworkFunctionInformation OPTIONAL

}



NSSAIMap		::= SEQUENCE
@@ -2520,7 +2570,8 @@ UsedUnitContainer ::= SEQUENCE 
	nSPAContainerInformation			[14] NSPAContainerInformation OPTIONAL,

	eventTimeStampExt					[15] SEQUENCE OF TimeStamp OPTIONAL,

	pC5ContainerInformation				[16] PC5ContainerInformation OPTIONAL,

	mBSContainerInformation				[17] MbsContainerInformation OPTIONAL

	mBSContainerInformation				[17] MbsContainerInformation OPTIONAL,

	networkSharingContainerInformation	[18] NetworkSharingContainerInformation OPTIONAL

}



--

ASN/TS32298_CSChargingDataTypes.asn

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ FROM MAP-SS-Code { itu-t identified-organization (4) etsi (0) mobileDomain (0) g 
-- from TS 29.002 [214]



MOLR-Type

FROM SS-DataTypes {itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Access (2) modules (3) ss-DataTypes (2) version17 (17)}

FROM SS-DataTypes {itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Access (2) modules (3) ss-DataTypes (2) version18 (18)}

-- from TS 24.080 [209] 



DefaultCallHandling,

ASN/TS32298_GPRSChargingDataTypes.asn

+12 −3
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ FROM MAP-LCS-DataTypes {itu-t identified-organization (4) etsi (0) mobileDomain 
-- from TS 29.002 [214]



LocationMethod

FROM SS-DataTypes {itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Access (2) modules (3) ss-DataTypes (2) version17 (17)}

FROM SS-DataTypes {itu-t identified-organization (4) etsi (0) mobileDomain (0) gsm-Access (2) modules (3) ss-DataTypes (2) version18 (18)}

-- from TS 24.080 [209] 



;
@@ -608,7 +608,8 @@ SGSNMTLCSRecord ::= SET 
	recordExtensions			 [26] ManagementExtensions OPTIONAL,

	causeForRecClosing			 [27] CauseForRecClosing,

	servingNodePLMNIdentifier	 [28] PLMN-Id OPTIONAL,

	cNOperatorSelectionEnt		 [29] CNOperatorSelectionEntity OPTIONAL

	cNOperatorSelectionEnt		 [29] CNOperatorSelectionEntity OPTIONAL,

	satelliteStoreAndForwardInformation	[30] SatelliteStoreAndForwardInformation OPTIONAL

}



SGSNMOLCSRecord			::= SET
@@ -640,7 +641,8 @@ SGSNMOLCSRecord ::= SET 
	recordExtensions			 [24] ManagementExtensions OPTIONAL,

	causeForRecClosing			 [25] CauseForRecClosing,

	servingNodePLMNIdentifier	 [26] PLMN-Id OPTIONAL,

	cNOperatorSelectionEnt		 [27] CNOperatorSelectionEntity OPTIONAL

	cNOperatorSelectionEnt		 [27] CNOperatorSelectionEntity OPTIONAL,

	satelliteStoreAndForwardInformation	[30] SatelliteStoreAndForwardInformation OPTIONAL

}



SGSNNILCSRecord			::= SET
@@ -1296,6 +1298,13 @@ ResultCode ::= INTEGER 
-- see Result-Code AVP as used in 32.299 [40]

--



SatelliteStoreAndForwardInformation 	::= SEQUENCE

{

	storeAndForwardIndicator		[0] BOOLEAN OPTIONAL,

	satelliteIDList					[1] SEQUENCE OF SatelliteID OPTIONAL



}



SecondaryRATType	::= INTEGER

{

	nR				(0)		-- New Radio 5G