Commit 221523f5 authored by Robert Tornkvist's avatar Robert Tornkvist
Browse files

Merge branch 'Integration_Rel19_SA5_161_ASN' into 'Rel-19'

Merge branch 'Integration_Rel19_SA5_161_ASN' into 'Rel-19'

See merge request !75
parents 9c3773fc cbb142b8
Loading
Loading
Loading
Loading
Loading
+37 −10
Original line number Diff line number Diff line
@@ -173,7 +173,8 @@ ChargingRecord ::= SET
	mBSSessionChargingInformation				[43] MbsSessionChargingInformation OPTIONAL,
	interCHFInformation							[44] InterCHFInformation OPTIONAL,
	nSSAAChargingInformation					[45] NSSAAChargingInformation OPTIONAL,
	rangingSLChargingInformation				[46] RangingSLChargingInformation OPTIONAL
	rangingSLChargingInformation				[46] RangingSLChargingInformation OPTIONAL,
	lCSInformation								[47] LCSInformation OPTIONAL

}

@@ -317,7 +318,9 @@ ExposureFunctionAPIInformation ::= SET
	internalIndividualIdentifier	[10] SubscriptionID OPTIONAL,
	aPIOperation					[11] APIOperation OPTIONAL,
	externalIndividualIdList		[12] SEQUENCE OF ExternalGroupIdentifier OPTIONAL,
	internalIndividualIdList		[13] SEQUENCE OF SubscriptionID OPTIONAL
-- externalIndividualIdList [12] field is replaced by externalIndIdList [14]
	internalIndividualIdList		[13] SEQUENCE OF SubscriptionID OPTIONAL,
	externalIndIdList				[14] SEQUENCE OF InvolvedParty OPTIONAL

}

@@ -537,7 +540,9 @@ IMSChargingInformation ::= SET
	sipRouteHeaderReceived					[54] UTF8String OPTIONAL,
	sipRouteHeaderTransmitted				[55] UTF8String OPTIONAL,
	tadIdentifier							[56] TADIdentifier OPTIONAL,
	feIdentifierList						[57] FEIdentifierList OPTIONAL
	feIdentifierList						[57] FEIdentifierList OPTIONAL,
	imsDCAppInfo							[58] IMSDCAppInfo OPTIONAL,
	satelliteIDList							[110] SEQUENCE Of SatelliteID OPTIONAL
}


@@ -728,7 +733,7 @@ NSSAAChargingInformation ::= SET


--
-- Ranging and Sidelink Positioning charging Information
-- 5GS LCS Charging Information
--

RangingSLChargingInformation	::= SET
@@ -741,6 +746,15 @@ RangingSLChargingInformation ::= SET
	locationEstimate						[5] UserLocation OPTIONAL
}

LCSInformation	::= SET
{
	lCSClientID								[0] LCSClientIdentity OPTIONAL,
	locationType							[1] LocationType OPTIONAL,
	locationEstimate						[2] UserLocation OPTIONAL,
	positioningData							[3] PositioningData OPTIONAL,
	targetUEID								[4] SubscriptionID OPTIONAL
}


--
-- CHF CHARGING TYPES
@@ -1159,12 +1173,24 @@ HFCNodeId ::= UTF8String
-- I 
-- 

IMSDCAppInfo 	::= SET
{
	applicationId			[0] UTF8String OPTIONAL,
	httpUrl					[1] IMSDCUrlInfo OPTIONAL
}

IMSDCUrlInfo 	::= SET
{
	streamId				[0] INTEGER OPTIONAL,
	replaceHttpUrl			[1] UTF8String OPTIONAL
}

IMSNodeFunctionality	::= ENUMERATED
{
	iMS-GWF				(0),
	aS					(1),
	mRFC				(2)

	mRFC				(2),
	dCSF				(3)
}

IMSSessionInformation ::= SEQUENCE 
@@ -1666,8 +1692,9 @@ NetworkFunctionality ::= ENUMERATED
	-- UPF is applicable only as API Target NF in NEF charging
	tSN-AF			(20),
	tSNTSF			(21),
	mB-SMF			(22)

	mB-SMF			(22),
	aIOTF			(23)
	-- AIOTF is applicable only as API Target NF in NEF charging
}

NgApCause	::= SEQUENCE
@@ -2346,7 +2373,7 @@ SatelliteBackhaulCategory ::= ENUMERATED

}


SatelliteID 	::= UTF8String OPTIONAL

-- 
-- T
+5 −1
Original line number Diff line number Diff line
@@ -184,7 +184,9 @@ PCSCFRecord ::= SET
												 -- ATCF only
	relatedICID								[107] IMS-Charging-Identifier OPTIONAL,
	relatedICIDGenerationNode				[108] NodeAddress OPTIONAL,
	fEIdentifierList                        [109] FEIdentifierList OPTIONAL
	fEIdentifierList                        [109] FEIdentifierList OPTIONAL,
	satelliteIDList							[110] SEQUENCE Of SatelliteID OPTIONAL


}
	
@@ -1014,6 +1016,8 @@ Status ::= ENUMERATED
	time-out			(2)
}

SatelliteID 	::= UTF8String OPTIONAL

-- 
-- T
-- 
+10 −1
Original line number Diff line number Diff line
@@ -147,7 +147,8 @@ targetIPaddress [26] IPAddress OPTIONAL,
	relayIPaddress					[27] IPAddress OPTIONAL,
proSeUEtoNetworkRelayUEID		[28] OCTET STRING OPTIONAL,
proSeTargetLayerTwoID			[29] OCTET STRING OPTIONAL	
			
	hopCount					[30] INTEGER OPTIONAL
	intermediateRelayInformationContainer				[31] SEQUENCE OF intermediateRelayInformation OPTIONAL			
}

--
@@ -191,6 +192,14 @@ CoverageStatus ::= ENUMERATED
	inCoverage					(1) 
}

--
-- I
--
intermediateRelayInformation	::= SEQUENCE
{
	intermediateRelayIPAddress			[0] IPAddress OPTIONAL
	proSeUEtoNetworkIntermediateRelayUEID			[1] OCTET STRING OPTIONAL,
}
-- 
-- L
-- 
+16 −2
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ BEGIN

IMPORTS	

CallDuration,
DataVolume 
FROM CSChargingDataTypes {itu-t (0) identified-organization (4) etsi(0) mobileDomain (0) charging (5) csChargingDataTypes (1) asn1Module (0) version2 (1)}

@@ -87,7 +88,8 @@ SCSMORecord ::= SET
	uETimeZone					[18] MSTimeZone OPTIONAL,
	sMSResult					[19] SMSResult OPTIONAL,
	localSequenceNumber			[22] LocalSequenceNumber OPTIONAL,
	recordExtensions			[23] ManagementExtensions OPTIONAL
	recordExtensions			[23] ManagementExtensions OPTIONAL,
	satelliteStoreAndForwardInformation	[24] SatelliteStoreAndForwardInformation OPTIONAL
}

SCSMOT4Record	::= SET
@@ -146,7 +148,8 @@ SCSMTRecord ::= SET
	sMSResult					[23] SMSResult OPTIONAL,
	sMDeviceTriggerInformation	[25] SMDeviceTriggerInformation OPTIONAL,
	localSequenceNumber			[26] LocalSequenceNumber OPTIONAL,
	recordExtensions			[27] ManagementExtensions OPTIONAL
	recordExtensions			[27] ManagementExtensions OPTIONAL,
	satelliteStoreAndForwardInformation	[28] SatelliteStoreAndForwardInformation OPTIONAL
}

SCDVTT4Record	::= SET
@@ -382,5 +385,16 @@ SMServingNode ::= SEQUENCE

SMSStatus		::= OCTET STRING (SIZE(1))

SatelliteStoreAndForwardInformation 	::= SEQUENCE
{
	storeAndForwardIndicator		[0] BOOLEAN OPTIONAL,
	satelliteIDList					[1] SEQUENCE Of SatelliteID OPTIONAL,
	storeDuration					[2] CallDuration OPTIONAL,
	storeDataVolume					[3]	DataVolume OPTIONAL

}

SatelliteID 	::= UTF8String OPTIONAL


END
 No newline at end of file