Commit 78d16b13 authored by mouqueta's avatar mouqueta
Browse files

Merge branch 'Integration_Rel19_SA5_162_CH_ASN' into 'Rel-19'

Integration_Rel19_SA5_162_CH_ASN into Rel-19

See merge request !103
parents 3162b511 ace2f35c
Loading
Loading
Loading
Loading
Loading
+91 −36
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ EnhancedDiagnostics,
DynamicAddressFlag,
InvolvedParty,
IPAddress,
LCSClientIdentity,
LocalSequenceNumber,
ManagementExtensions,
MessageClass,
@@ -28,6 +29,7 @@ Ncgi,
Nid,
NodeAddress,
PLMN-Id,
PositioningData,
PriorityType,
PSCellInformation,
RANNASCause,
@@ -174,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

}

@@ -239,8 +242,9 @@ PDUSessionChargingInformation ::= SET
	fiveGSBridgeInformation					[51] FiveGSBridgeInformation OPTIONAL,
	fiveGMulticastService					[52] FiveGMulticastService OPTIONAL,
	satelliteAccessIndicator				[53] BOOLEAN OPTIONAL,
	satelliteBackhaulInformation			[54] SatelliteBackhaulInformation OPTIONAL

	satelliteBackhaulInformation			[54] SatelliteBackhaulInformation OPTIONAL,
	serviceLevelAA							[55] UTF8String OPTIONAL
	userDisasterRoamingInd					[55] BOOLEAN OPTIONAL

}

@@ -359,7 +363,9 @@ 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,
	serviceLevelAA						[28] UTF8String OPTIONAL
	userDisasterRoamingInd				[28] BOOLEAN OPTIONAL

}

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

--
-- Network Sharing charging Information
--

NetworkSharingChargingInformation			::= SET
{
	plmnId						[0] PLMN-Id,
	singelNSSAI					[1] SingleNSSAI OPTIONAL
}

--
-- NSM charging Information
@@ -542,7 +557,8 @@ IMSChargingInformation ::= SET
	tadIdentifier							[56] TADIdentifier OPTIONAL,
	feIdentifierList						[57] FEIdentifierList OPTIONAL,
	imsDCAppInfo							[58] IMSDCAppInfo OPTIONAL,
	satelliteIDList							[110] SEQUENCE Of SatelliteID OPTIONAL
	mediaResource							[59] MediaResource OPTIONAL,
	satelliteIDList							[110] SEQUENCE OF SatelliteID OPTIONAL
}


@@ -616,7 +632,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		


}

@@ -743,14 +764,14 @@ RangingSLChargingInformation ::= SET
	sLPositioningServerUEID					[2] SubscriptionID OPTIONAL,
	locatedUEID								[3] SubscriptionID OPTIONAL,
	locationType							[4] LocationType OPTIONAL,
	locationEstimate						[5] UserLocation OPTIONAL
	locationEstimate						[5] UserLocationInformationStructured OPTIONAL
}

LCSInformation	::= SET
{
	lCSClientID								[0] LCSClientIdentity OPTIONAL,
	locationType							[1] LocationType OPTIONAL,
	locationEstimate						[2] UserLocation OPTIONAL,
	locationEstimate						[2] UserLocationInformationStructured OPTIONAL,
	positioningData							[3] PositioningData OPTIONAL,
	targetUEID								[4] SubscriptionID OPTIONAL
}
@@ -867,7 +888,11 @@ AuthorizedQoSInformation ::= SEQUENCE
	averWindow			[4] INTEGER OPTIONAL,
	maxDataBurstVol		[5] INTEGER OPTIONAL
}

AvatarMedia	::= SEQUENCE
{
	resourceURL								[0] UTF8String OPTIONAL,
	mediaProcessingSpecification			[1] UTF8String OPTIONAL
}
-- 
-- B
-- 
@@ -1244,6 +1269,13 @@ InternalGroupIdentifier ::= UTF8String
-- See 3GPP TS 29.571 [249] for details
-- 

IntermeidateRelayInformation	::= SEQUENCE
{
	intermediateRelayIPAddress				[0] IPAddress OPTIONAL,
	proSeUEtoNetworkIntermediateRelayUEID	[1] UTF8String OPTIONAL

}

-- 
-- K
-- 
@@ -1438,7 +1470,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
{
@@ -1564,6 +1608,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,
@@ -1695,6 +1747,7 @@ NetworkFunctionality ::= ENUMERATED
	mB-SMF			(22),
	aIOTF			(23)
	-- AIOTF is applicable only as API Target NF in NEF charging
	nWDAF			(24)
}

NgApCause	::= SEQUENCE
@@ -1749,7 +1802,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
@@ -2047,6 +2101,31 @@ Sac ::= UTF8String
-- See 3GPP TS 29.571 [249] for details
-- 


SatelliteBackhaulInformation 	::= SEQUENCE
{
	satelliteBackhaulCategory			[0] SatelliteBackhaulCategory OPTIONAL,
	gEOSatelliteID					[1] UTF8String OPTIONAL 

}
-- See 3GPP TS 29.571 [249] for details.

SatelliteBackhaulCategory ::= ENUMERATED
{
	gEO   				(0),
	mEO 				(1),
	lEO					(2),
	oTHERSAT 			(3),
	dYNAMICGEO 			(4),
	dYNAMICMEO			(5),
	dYNAMICLEO 			(6),
	dYNAMICOTHERSAT 	(7),
	nONSATELLITE		(8)

}

SatelliteID 	::= UTF8String

ServiceArea ::= SEQUENCE
{
	mBSServiceArea	[0] MbsServiceArea OPTIONAL,
@@ -2350,31 +2429,6 @@ SynchronizationState ::= ENUMERATED
}


SatelliteBackhaulInformation 	::= SEQUENCE
{
	satelliteBackhaulCategory			[0] SatelliteBackhaulCategory OPTIONAL,
	gEOSatelliteID					[1] UTF8String OPTIONAL 

}
-- See 3GPP TS 29.571 [249] for details.


SatelliteBackhaulCategory ::= ENUMERATED
{
	gEO   				(0),
	mEO 				(1),
	lEO					(2),
	oTHERSAT 			(3),
	dYNAMICGEO 			(4),
	dYNAMICMEO			(5),
	dYNAMICLEO 			(6),
	dYNAMICOTHERSAT 	(7),
	nONSATELLITE		(8)

}

SatelliteID 	::= UTF8String OPTIONAL

-- 
-- T
-- 
@@ -2518,7 +2572,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
}

--
+2 −1
Original line number Diff line number Diff line
@@ -173,4 +173,5 @@ SubmissionResultCode ::= INTEGER
-- for MO/MT data transfer
--


END           
 No newline at end of file
+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,
+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
+2 −2
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ PCSCFRecord ::= SET
	relatedICID								[107] IMS-Charging-Identifier OPTIONAL,
	relatedICIDGenerationNode				[108] NodeAddress OPTIONAL,
	fEIdentifierList                        [109] FEIdentifierList OPTIONAL,
	satelliteIDList							[110] SEQUENCE Of SatelliteID OPTIONAL
	satelliteIDList							[110] SEQUENCE OF SatelliteID OPTIONAL


}
@@ -1016,7 +1016,7 @@ Status ::= ENUMERATED
	time-out			(2)
}

SatelliteID 	::= UTF8String OPTIONAL
SatelliteID 	::= UTF8String

-- 
-- T
Loading