Merge branch 'Integration_Rel18_SA5_150_YAML' into... (4b25a30d) · Commits · SA5 – Management & Orchestration and Charging / Management and Orchestration APIs

OpenAPI/TS28105_AiMlNrm.yaml

+56 −24

Original line number	Diff line number	Diff line
		@@ -15,27 +15,6 @@ components:

		#-------- Definition of types-----------------------------------------------------

		MLEntityList:
		type: array
		items:
		$ref: '#/components/schemas/MLEntity'

		MLEntity:
		type: object
		properties:
		mLEntityId:
		type: string
		inferenceType:
		type: string
		mLEntityVersion:
		type: string
		expectedRunTimeContext:
		$ref: '#/components/schemas/MLContext'
		trainingContext:
		$ref: '#/components/schemas/MLContext'
		runTimeContext:
		$ref: '#/components/schemas/MLContext'

		MLContext:
		type: object
		properties:
		@@ -122,6 +101,8 @@ components:
		$ref: '#/components/schemas/ManagedElement-Multiple'
		MLTrainingFunction:
		$ref: '#/components/schemas/MLTrainingFunction-Multiple'
		MLEntityRepository:
		$ref: '#/components/schemas/MLEntityRepository-Multiple'

		ManagedElement-Single:
		allOf:
		@@ -135,6 +116,8 @@ components:
		properties:
		MLTrainingFunction:
		$ref: '#/components/schemas/MLTrainingFunction-Multiple'
		MLEntityRepository:
		$ref: '#/components/schemas/MLEntityRepository-Multiple'

		MLTrainingFunction-Single:
		allOf:
		@@ -146,8 +129,8 @@ components:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr'
		- type: object
		properties:
		mLEntityList:
		$ref: '#/components/schemas/MLEntityList'
		mLEntityRepositoryRef:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
		- type: object
		properties:
		@@ -169,6 +152,8 @@ components:
		properties:
		mLEntityId:
		type: string
		inferenceType:
		type: string
		candidateTrainingDataSource:
		type: array
		items:
		@@ -188,6 +173,8 @@ components:
		type: boolean
		suspendRequest:
		type: boolean
		mLEntityToTrainRef:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

		MLTrainingProcess-Single:
		allOf:
		@@ -249,6 +236,42 @@ components:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
		lastTrainingRef:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
		mLEnityGeneratedRef:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

		MLEntity-Single:
		allOf:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
		- type: object
		properties:
		attributes:
		type: object
		properties:
		mLEntityId:
		type: string
		inferenceType:
		type: string
		mLEntityVersion:
		type: string
		expectedRunTimeContext:
		$ref: '#/components/schemas/MLContext'
		trainingContext:
		$ref: '#/components/schemas/MLContext'
		runTimeContext:
		$ref: '#/components/schemas/MLContext'

		MLEntityRepository-Single:
		allOf:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
		- type: object
		properties:
		attributes:
		type: object
		properties:
		mLRepositoryId:
		type: string
		MLEntity:
		$ref: '#/components/schemas/MLEntity-Multiple'

		#-------- Definition of JSON arrays for name-contained IOCs ----------------------

		@@ -276,7 +299,14 @@ components:
		type: array
		items:
		$ref: '#/components/schemas/MLTrainingReport-Single'

		MLEntity-Multiple:
		type: array
		items:
		$ref: '#/components/schemas/MLEntity-Single'
		MLEntityRepository-Multiple:
		type: array
		items:
		$ref: '#/components/schemas/MLEntityRepository-Single'

		#-------- Definitions in TS 28.104 for TS 28.532 ---------------------------------

		@@ -289,3 +319,5 @@ components:
		- $ref: '#/components/schemas/MLTrainingRequest-Single'
		- $ref: '#/components/schemas/MLTrainingProcess-Single'
		- $ref: '#/components/schemas/MLTrainingReport-Single'
		- $ref: '#/components/schemas/MLEntity-Single'
		- $ref: '#/components/schemas/MLEntityRepository-Single'

OpenAPI/TS28312_IntentExpectations.yaml

+164 −69

Original line number	Diff line number	Diff line
		@@ -30,19 +30,21 @@ components:
		items:
		type: object
		oneOf:
		- $ref: "#/components/schemas/WeakRSRPRatioTarget"
		- $ref: "#/components/schemas/LowSINRRatioTarget"
		- $ref: "#/components/schemas/AveULRANUEThptTarget"
		- $ref: "#/components/schemas/AveDLRANUEThptTarget"
		- $ref: "#/components/schemas/LowULRANUEThptRatioTarget"
		- $ref: "#/components/schemas/LowDLRANUEThptRatioTarget"
		- $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget"
		- $ref: '#/components/schemas/WeakRSRPRatioTarget'
		- $ref: '#/components/schemas/LowSINRRatioTarget'
		- $ref: '#/components/schemas/AveULRANUEThptTarget'
		- $ref: '#/components/schemas/AveDLRANUEThptTarget'
		- $ref: '#/components/schemas/LowULRANUEThptRatioTarget'
		- $ref: '#/components/schemas/LowDLRANUEThptRatioTarget'
		- $ref: '#/components/schemas/HighULPrbLoadRatioTarget'
		- $ref: '#/components/schemas/HighDLPrbLoadRatioTarget'
		- $ref: '#/components/schemas/AveULPrbLoadTarget'
		- $ref: '#/components/schemas/AveDLPrbLoadTarget'
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget'
		expectationContexts:
		type: array
		items:
		$ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext"
		expectationfulfilmentInfo:
		$ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo"
		$ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext'
		required:
		- expectationId
		ServiceSupportExpectation:
		@@ -53,34 +55,32 @@ components:
		expectationId:
		type: string
		expectationVerb:
		$ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb"
		$ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb'
		expectationObject:
		$ref: "#/components/schemas/ServiceSupportExpectationObject"
		$ref: '#/components/schemas/ServiceSupportExpectationObject'
		expectationTargets:
		type: array
		items:
		type: object
		oneOf:
		- $ref: "#/components/schemas/DLThptPerUETarget"
		- $ref: "#/components/schemas/ULThptPerUETarget"
		- $ref: "#/components/schemas/DLLatencyTarget"
		- $ref: "#/components/schemas/ULLatencyTarget"
		- $ref: "#/components/schemas/MaxNumberofUEsTarget"
		- $ref: "#/components/schemas/ActivityFactorTarget"
		- $ref: "#/components/schemas/UESpeedTarget"
		- $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget"
		- $ref: '#/components/schemas/DLThptPerUETarget'
		- $ref: '#/components/schemas/ULThptPerUETarget'
		- $ref: '#/components/schemas/DLLatencyTarget'
		- $ref: '#/components/schemas/ULLatencyTarget'
		- $ref: '#/components/schemas/MaxNumberofUEsTarget'
		- $ref: '#/components/schemas/ActivityFactorTarget'
		- $ref: '#/components/schemas/UESpeedTarget'
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget'
		expectationContexts:
		type: array
		items:
		type: object
		oneOf:
		- $ref: "#/components/schemas/ServiceStartTimeContext"
		- $ref: "#/components/schemas/ServiceEndTimeContext"
		- $ref: "#/components/schemas/UEMobilityLevelContext"
		- $ref: "#/components/schemas/ResourceSharingLevelContext"
		- $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext"
		expectationfulfilmentInfo:
		$ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo"
		- $ref: '#/components/schemas/ServiceStartTimeContext'
		- $ref: '#/components/schemas/ServiceEndTimeContext'
		- $ref: '#/components/schemas/UEMobilityLevelContext'
		- $ref: '#/components/schemas/ResourceSharingLevelContext'
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext'
		required:
		- expectationId
		#-------Definition of the IntentExpectation dataType ----------#
		@@ -96,18 +96,19 @@ components:
		enum:
		- RAN_SubNetwork
		objectInstance:
		$ref: "TS28623_ComDefs.yaml#/components/schemas/Dn"
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
		objectContexts:
		type: array
		items:
		type: object
		oneOf:
		- $ref: "#/components/schemas/CoverageAreaPolygonContext"
		- $ref: "#/components/schemas/CoverageTACContext"
		- $ref: "#/components/schemas/PLMNContext"
		- $ref: "#/components/schemas/NRFqBandContext"
		- $ref: "#/components/schemas/RATContext"
		- $ref: "TS28312_IntentNrm.yaml#/components/schemas/ObjectContext"
		- $ref: '#/components/schemas/CoverageAreaPolygonContext'
		- $ref: '#/components/schemas/CoverageTACContext'
		- $ref: '#/components/schemas/PLMNContext'
		- $ref: '#/components/schemas/NRFqBandContext'
		- $ref: '#/components/schemas/RATContext'
		- $ref: '#/components/schemas/ObjectContext'
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext'
		ServiceSupportExpectationObject:
		description: >-
		This data type is the "ExpectationObject" data type with specialisations for ServiceSupportExpectation
		@@ -118,16 +119,16 @@ components:
		enum:
		- Service_Support
		objectInstance:
		$ref: "TS28623_ComDefs.yaml#/components/schemas/Dn"
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
		objectContexts:
		type: array
		items:
		type: object
		oneOf:
		- $ref: "#/components/schemas/EdgeIdenfiticationIdContext"
		- $ref: "#/components/schemas/EdgeIdenfiticationLocContext"
		- $ref: "#/components/schemas/CoverageAreaTAContext"
		- $ref: "TS28312_IntentNrm.yaml#/components/schemas/ObjectContext"
		- $ref: '#/components/schemas/EdgeIdentificationIdContext'
		- $ref: '#/components/schemas/EdgeIdentificationLocContext'
		- $ref: '#/components/schemas/CoverageAreaTAContext'
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext'
		#-------Definition of the ExpectationObject dataType ----------#


		@@ -150,9 +151,7 @@ components:
		minimum: 0
		maximum: 100
		targetContexts:
		$ref: "#/components/schemas/WeakRSRPContext"
		targetFulfilmentInfo:
		$ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo"
		$ref: '#/components/schemas/WeakRSRPContext'
		WeakRSRPContext:
		description: >-
		This data type is the "TargetContext" data type with specialisations for WeakRSRPContext
		@@ -186,9 +185,7 @@ components:
		minimum: 0
		maximum: 100
		targetContexts:
		$ref: "#/components/schemas/LowSINRContext"
		targetFulfilmentInfo:
		$ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo"
		$ref: '#/components/schemas/LowSINRContext'
		LowSINRContext:
		description: >-
		This data type is the "TargetContext" data type with specialisations for LowSINRContext
		@@ -219,8 +216,6 @@ components:
		- IS_GREATER_THAN
		targetValueRange:
		type: integer
		targetFulfilmentInfo:
		$ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo"
		AveDLRANUEThptTarget:
		description: >-
		This data type is the "ExpectationTarget" data type with specialisations for AveDLRANUEThptTarget
		@@ -236,8 +231,6 @@ components:
		- IS_GREATER_THAN
		targetValueRange:
		type: integer
		targetFulfilmentInfo:
		$ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo"
		LowULRANUEThptRatioTarget:
		description: >-
		This data type is the "ExpectationTarget" data type with specialisations for LowULRANUEThptRatioTarget
		@@ -256,9 +249,7 @@ components:
		minimum: 0
		maximum: 100
		targetContexts:
		$ref: "#/components/schemas/LowULRANUEThptContext"
		targetFulfilmentInfo:
		$ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo"
		$ref: '#/components/schemas/LowULRANUEThptContext'
		LowULRANUEThptContext:
		description: >-
		This data type is the "TargetContext" data type with specialisations for LowULRANUEThptContext
		@@ -292,9 +283,7 @@ components:
		minimum: 0
		maximum: 100
		targetContexts:
		$ref: "#/components/schemas/LowDLRANUEThptContext"
		targetFulfilmentInfo:
		$ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo"
		$ref: '#/components/schemas/LowDLRANUEThptContext'
		LowDLRANUEThptContext:
		description: >-
		This data type is the "TargetContext" data type with specialisations for LowDLRANUEThptContext
		@@ -310,6 +299,112 @@ components:
		- IS_LESS_THAN
		contextValueRange:
		type: number
		HighULPrbLoadRatioTarget:
		description: >-
		This data type is the "ExpectationTarget" data type with specialisations for HighULPrbLoadRatioTarget
		type: object
		properties:
		targetName:
		type: string
		enum:
		- HighULPrbLoadRatio
		targetCondition:
		type: string
		enum:
		- IS_LESS_THAN
		targetValueRange:
		type: integer
		minimum: 0
		maximum: 100
		targetContexts:
		$ref: '#/components/schemas/HighULPrbLoadContext'
		HighULPrbLoadContext:
		description: >-
		This data type is the "TargetContext" data type with specialisations for HighULPrbLoadContext
		type: object
		properties:
		contextAttribute:
		type: string
		enum:
		- HighULPrbLoadThreshold
		contextCondition:
		type: string
		enum:
		- IS_LESS_THAN
		contextValueRange:
		type: integer
		minimum: 0
		maximum: 100
		HighDLPrbLoadRatioTarget:
		description: >-
		This data type is the "ExpectationTarget" data type with specialisations for HighDLPrbLoadRatioTarget
		type: object
		properties:
		targetName:
		type: string
		enum:
		- HighDLPrbLoadRatio
		targetCondition:
		type: string
		enum:
		- IS_LESS_THAN
		targetValueRange:
		type: integer
		minimum: 0
		maximum: 100
		targetContexts:
		$ref: '#/components/schemas/HighDLPrbLoadContext'
		HighDLPrbLoadContext:
		description: >-
		This data type is the "TargetContext" data type with specialisations for HighDLPrbLoadContext
		type: object
		properties:
		contextAttribute:
		type: string
		enum:
		- HighDLPrbLoadThreshold
		contextCondition:
		type: string
		enum:
		- IS_LESS_THAN
		contextValueRange:
		type: integer
		minimum: 0
		maximum: 100
		AveULPrbLoadTarget:
		description: >-
		This data type is the "ExpectationTarget" data type with specialisations for AveULPrbLoadTarget
		type: object
		properties:
		targetName:
		type: string
		enum:
		- AveULPrbLoad
		targetCondition:
		type: string
		enum:
		- IS_LESS_THAN
		targetValueRange:
		type: integer
		minimum: 0
		maximum: 100
		AveDLPrbLoadTarget:
		description: >-
		This data type is the "ExpectationTarget" data type with specialisations for AveDLPrbLoadTarget
		type: object
		properties:
		targetName:
		type: string
		enum:
		- AveDLPrbLoad
		targetCondition:
		type: string
		enum:
		- IS_LESS_THAN
		targetValueRange:
		type: integer
		minimum: 0
		maximum: 100
		DLThptPerUETarget:
		description: >-
		This data type is the "ExpectationTarget" data type with specialisations for DLThptPerUETarget
		@@ -324,7 +419,7 @@ components:
		enum:
		- IS_GREATER_THAN
		targetValueRange:
		$ref: "TS28541_SliceNrm.yaml#/components/schemas/XLThpt"
		$ref: 'TS28541_SliceNrm.yaml#/components/schemas/XLThpt'
		ULThptPerUETarget:
		description: >-
		This data type is the "ExpectationTarget" data type with specialisations for ULThptPerUETarget
		@@ -339,7 +434,7 @@ components:
		enum:
		- IS_GREATER_THAN
		targetValueRange:
		$ref: "TS28541_SliceNrm.yaml#/components/schemas/XLThpt"
		$ref: 'TS28541_SliceNrm.yaml#/components/schemas/XLThpt'
		DLLatencyTarget:
		description: >-
		This data type is the "ExpectationTarget" data type with specialisations for DLLatencyTarget
		@@ -426,7 +521,7 @@ components:
		contextAttribute:
		type: string
		contextCondition:
		$ref: "TS28312_IntentNrm.yaml#/components/schemas/Condition"
		$ref: 'TS28312_IntentNrm.yaml#/components/schemas/Condition'
		contextValueRange:
		type: array
		items:
		@@ -447,7 +542,7 @@ components:
		contextValueRange:
		type: array
		items:
		$ref: "#/components/schemas/CoverageArea"
		$ref: '#/components/schemas/CoverageArea'
		CoverageArea:
		type: string
		CoverageTACContext:
		@@ -466,7 +561,7 @@ components:
		contextValueRange:
		type: array
		items:
		$ref: "TS28541_NrNrm.yaml#/components/schemas/NrTac"
		$ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTac'
		PLMNContext:
		description: >-
		This data type is the "ObjectContext" data type with specialisations for PLMNContext
		@@ -483,7 +578,7 @@ components:
		contextValueRange:
		type: array
		items:
		$ref: "TS28623_ComDefs.yaml#/components/schemas/PlmnId"
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
		NRFqBandContext:
		description: >-
		This data type is the "ObjectContext" data type with specialisations for NRFqBandContext
		@@ -522,9 +617,9 @@ components:
		- UTRAN
		- EUTRAN
		- NR
		EdgeIdenfiticationIdContext:
		EdgeIdentificationIdContext:
		description: >-
		This data type is the "ObjectContext" data type with specialisations for EdgeIdenfiticationIdContext
		This data type is the "ObjectContext" data type with specialisations for EdgeIdentificationIdContext
		type: object
		properties:
		contextAttribute:
		@@ -539,9 +634,9 @@ components:
		type: array
		items:
		type: string
		EdgeIdenfiticationLocContext:
		EdgeIdentificationLocContext:
		description: >-
		This data type is the "ObjectContext" data type with specialisations for EdgeIdenfiticationLocContext
		This data type is the "ObjectContext" data type with specialisations for EdgeIdentificationLocContext
		type: object
		properties:
		contextAttribute:
		@@ -572,12 +667,12 @@ components:
		contextValueRange:
		type: array
		items:
		$ref: "#/components/schemas/CoverageAreaTAList"
		$ref: '#/components/schemas/CoverageAreaTAList'
		CoverageAreaTAList:
		type: integer
		#-------Definition of the scenario specific ObjectTarget dataType----------------#

		#-------Definition of the concrete ExpectionContext dataType----------------#
		#-------Definition of the concrete ExpectationContext dataType----------------#
		ServiceStartTimeContext:
		description: >-
		This data type is the "ExpectationContext" data type with specialisations for ServiceStartTimeContext
		@@ -624,7 +719,7 @@ components:
		contextValueRange:
		type: array
		items:
		$ref: "TS28541_SliceNrm.yaml#/components/schemas/MobilityLevel"
		$ref: 'TS28541_SliceNrm.yaml#/components/schemas/MobilityLevel'
		ResourceSharingLevelContext:
		description: >-
		This data type is the "ExpectationContext" data type with specialisations for ResourceSharingLevelContext
		@@ -641,5 +736,5 @@ components:
		contextValueRange:
		type: array
		items:
		$ref: "TS28541_SliceNrm.yaml#/components/schemas/SharingLevel"
		$ref: 'TS28541_SliceNrm.yaml#/components/schemas/SharingLevel'
		#-------Definition of the concrete ExpectionContext dataType----------------#

OpenAPI/TS28312_IntentNrm.yaml

+198 −33

File changed.

Preview size limit exceeded, changes collapsed.

OpenAPI/TS28541_5GcNrm.yaml

+1088 −176

File changed.

Preview size limit exceeded, changes collapsed.

OpenAPI/TS28541_NrNrm.yaml

+12 −20

Original line number	Diff line number	Diff line
		@@ -97,30 +97,22 @@ components:
		type: integer
		maximum: 503
		NrTac:
		type: integer
		maximum: 16777215
		$ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac'
		NrTacList:
		type: array
		items:
		$ref: '#/components/schemas/NrTac'
		Tai:
		type: object
		properties:
		plmnId:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
		nrTac:
		$ref: '#/components/schemas/NrTac'
		$ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac'
		TaiList:
		type: array
		items:
		$ref: '#/components/schemas/Tai'
		$ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai'
		BackhaulAddress:
		type: object
		properties:
		gnbId:
		$ref: '#/components/schemas/GnbId'
		tai:
		$ref: "#/components/schemas/Tai"
		$ref: "TS28623_GenericNrm.yaml#/components/schemas/Tai"
		MappingSetIDBackhaulAddress:
		type: object
		properties:
		@@ -182,7 +174,7 @@ components:
		timeDuration:
		type: integer

		UeAccProbilityDist:
		UeAccProbabilityDist:
		type: object
		properties:
		targetProbability:
		@@ -190,7 +182,7 @@ components:
		numberofpreamblessent:
		type: integer

		UeAccDelayProbilityDist:
		UeAccDelayProbabilityDist:
		type: object
		properties:
		targetProbability:
		@@ -949,7 +941,7 @@ components:
		nrPci:
		$ref: '#/components/schemas/NrPci'
		nrTac:
		$ref: '#/components/schemas/NrTac'
		$ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac'
		arfcnDL:
		type: integer
		arfcnUL:
		@@ -1039,7 +1031,7 @@ components:
		plmnInfoList:
		$ref: '#/components/schemas/PlmnInfoList'
		nrTac:
		$ref: '#/components/schemas/NrTac'
		$ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac'

		NRFrequency-Single:
		allOf:
		@@ -1418,10 +1410,10 @@ components:
		properties:
		drachOptimizationControl:
		type: boolean
		ueAccProbilityDist:
		$ref: "#/components/schemas/UeAccProbilityDist"
		ueAccDelayProbilityDist:
		$ref: "#/components/schemas/UeAccDelayProbilityDist"
		ueAccProbabilityDist:
		$ref: "#/components/schemas/UeAccProbabilityDist"
		ueAccDelayProbabilityDist:
		$ref: "#/components/schemas/UeAccDelayProbabilityDist"
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'

		DMROFunction-Single: