Merge branch 'Integration_Rel18_SA5_150_YAML' into... (c1cd6f0c) · 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

+359 −82

File changed.

Preview size limit exceeded, changes collapsed.

OpenAPI/TS28312_IntentNrm.yaml

+205 −37

Original line number	Diff line number	Diff line
		@@ -27,8 +27,8 @@ components:
		properties:
		SubNetwork:
		$ref: '#/components/schemas/SubNetwork-Multiple'
		Intent:
		$ref: '#/components/schemas/Intent-Multiple'
		IntentHandlingFunction:
		$ref: '#/components/schemas/IntentHandlingFunction-Multiple'

		Intent-Single:
		allOf:
		@@ -44,13 +44,56 @@ components:
		oneOf:
		- $ref: "#/components/schemas/IntentExpectation"
		- $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioNetworkExpectation"
		- $ref: "TS28312_IntentExpectations.yaml#/components/schemas/ServiceSupportExpectation"
		- $ref: "TS28312_IntentExpectations.yaml#/components/schemas/EdgeServiceSupportExpectation"
		intentContexts:
		type: array
		items:
		$ref: "#/components/schemas/IntentContext"
		intentFulfilmentInfo:
		$ref: "#/components/schemas/FulfilmentInfo"
		$ref: '#/components/schemas/IntentContext'
		intentAdminState:
		type: string
		enum:
		- ACTIVATED
		- DEACTIVATED
		intentPriority:
		type: integer
		observationPeriod:
		type: integer
		intentReportReference:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
		IntentReport-Single:
		allOf:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
		- type: object
		properties:
		intentFulfilmentReport:
		type: array
		items:
		$ref: '#/components/schemas/IntentFulfilmentReport'
		intentConflictReports:
		type: array
		items:
		$ref: '#/components/schemas/IntentConflictReport'
		intentFeasibilityCheckReport:
		type: array
		items:
		$ref: '#/components/schemas/IntentFeasibilityCheckReport'
		intentReference:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

		IntentHandlingFunction-Single:
		allOf:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
		- type: object
		properties:
		intentHandlingCapabilityList:
		type: array
		items:
		$ref: '#/components/schemas/IntentHandlingCapability'
		Intent:
		$ref: '#/components/schemas/Intent-Multiple'
		IntentReport:
		$ref: '#/components/schemas/IntentReport-Multiple'

		#-------Definition of generic IOCs ----------#

		#-------Definition of the generic IntentExpectation dataType ----------#
		@@ -63,20 +106,16 @@ components:
		type: string
		expectationVerb:
		$ref: "#/components/schemas/ExpectationVerb"
		expectationObjects:
		type: array
		items:
		expectationObject:
		$ref: "#/components/schemas/ExpectationObject"
		expectationTargets:
		type: array
		items:
		$ref: "#/components/schemas/ExpectationTarget"
		$ref: '#/components/schemas/ExpectationTarget'
		expectationContexts:
		type: array
		items:
		$ref: "#/components/schemas/ExpectationContext"
		expectationfulfilmentInfo:
		$ref: "#/components/schemas/FulfilmentInfo"
		$ref: '#/components/schemas/ExpectationContext'
		required:
		- expectationId
		#-------Definition of the generic IntentExpectation dataType ----------#
		@@ -91,14 +130,13 @@ components:
		type: string
		enum:
		- RAN_SubNetwork #value for Radio Network Expectation--#
		- Service_Support #value for Service Support Expectation--#
		- TBD #-This will be added based on defined scenario specfic intent expectation-#
		- Edge_Service_Support #value for Edge Service Support Expectation--#
		objectInstance:
		$ref: "TS28623_ComDefs.yaml#/components/schemas/Dn"
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
		objectContexts:
		type: array
		items:
		$ref: "#/components/schemas/ObjectContext"
		$ref: '#/components/schemas/ObjectContext'

		#-------Definition of the generic ExpectationObject dataType ----------#

		@@ -136,7 +174,7 @@ components:
		type: object
		properties:
		fulfilStatus:
		$ref: "#/components/schemas/FulfilStatus"
		$ref: '#/components/schemas/FulfilStatus'
		notFullfilledState:
		description: ->
		An attribute which is used when FulfilmentInfo is implemented for IntentFulfilmentInfo
		@@ -151,6 +189,17 @@ components:
		enum:
		- DELIVER
		- ENSURE
		ValueRangeType:
		oneOf:
		- type: number
		- type: string
		- type: boolean
		- type: integer
		- $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow'
		- $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
		- $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea'
		- $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
		- $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate '
		#-------Definition of the generic dataType --------------#

		#-------Definition of the generic IntentContext dataType --------------#
		@@ -162,11 +211,13 @@ components:
		contextAttribute:
		type: string
		contextCondition:
		$ref: "#/components/schemas/Condition"
		$ref: '#/components/schemas/Condition'
		contextValueRange:
		type: array
		oneOf:
		- type: array
		items:
		type: number
		$ref: "#/components/schemas/ValueRangeType"
		- $ref: "#/components/schemas/ValueRangeType"
		#-------Definition of the generic IntentContext dataType --------------#

		#-------Definition of the generic ExpectationTarget dataType----------#
		@@ -178,13 +229,17 @@ components:
		targetName:
		type: string
		targetCondition:
		$ref: "#/components/schemas/Condition"
		$ref: '#/components/schemas/Condition'
		targetValueRange:
		type: number
		oneOf:
		- type: array
		items:
		$ref: "#/components/schemas/ValueRangeType"
		- $ref: "#/components/schemas/ValueRangeType"
		targetContexts:
		type: array
		items:
		$ref: "#/components/schemas/TargetContext"
		$ref: '#/components/schemas/TargetContext'
		TargetContext:
		description: >-
		This data type is the "TargetContext" data type without specialisations
		@@ -193,9 +248,13 @@ components:
		contextAttribute:
		type: string
		contextCondition:
		$ref: "#/components/schemas/Condition"
		$ref: '#/components/schemas/Condition'
		contextValueRange:
		type: number
		oneOf:
		- type: array
		items:
		$ref: "#/components/schemas/ValueRangeType"
		- $ref: "#/components/schemas/ValueRangeType"
		#-------Definition of the generic ExpectationTarget dataType----------#

		#-------Definition of the generic ObjectContext dataType----------------#
		@@ -207,11 +266,13 @@ components:
		contextAttribute:
		type: string
		contextCondition:
		$ref: "#/components/schemas/Condition"
		$ref: '#/components/schemas/Condition'
		contextValueRange:
		type: array
		oneOf:
		- type: array
		items:
		type: number
		$ref: "#/components/schemas/ValueRangeType"
		- $ref: "#/components/schemas/ValueRangeType"
		#-------Definition of the generic ObjectContext dataType----------------#

		#-------Definition of the generic ExpectionContext dataType----------------#
		@@ -223,12 +284,107 @@ components:
		contextAttribute:
		type: string
		contextCondition:
		$ref: "#/components/schemas/Condition"
		$ref: '#/components/schemas/Condition'
		contextValueRange:
		oneOf:
		- type: array
		items:
		$ref: "#/components/schemas/ValueRangeType"
		- $ref: "#/components/schemas/ValueRangeType"
		#-------Definition of the concrete ExpectionContext dataType----------------#
		#-------Definition of the generic IntentFulfilmentReport dataType----------------#
		IntentFulfilmentReport:
		description: >-
		This data type is the "IntentFulfilmentReport" data type without specialisations
		type: object
		properties:
		intentFulfilmentInfo:
		$ref: '#/components/schemas/FulfilmentInfo'
		expectationFulfilmentResult:
		type: array
		items:
		$ref: '#/components/schemas/ExpectationFulfilmentResult'
		#-------Definition of the concrete IntentFulfilmentReport dataType----------------#

		#-------Definition of the generic ExpectationFulfilmentResult dataType----------------#
		ExpectationFulfilmentResult:
		description: >-
		This data type is the "ExpectationFulfilmentResult" data type without specialisations
		type: object
		properties:
		expectaitonId:
		type: string
		expectationFulfilmentInfo:
		$ref: '#/components/schemas/FulfilmentInfo'
		targetFulfilmentResult:
		type: array
		items:
		$ref: '#/components/schemas/TargetFulfilmentResult'
		#-------Definition of the concrete ExpectationFulfilmentResult dataType----------------#

		#-------Definition of the generic TargetFulfilmentResult dataType----------------#
		TargetFulfilmentResult:
		description: >-
		This data type is the "TargetFulfilmentResult" data type without specialisations
		type: object
		properties:
		targetName:
		type: string
		targetFulfilmentInfo:
		$ref: '#/components/schemas/FulfilmentInfo'
		targetAchievedValue:
		type: number
		#-------Definition of the concrete ExpectionContext dataType----------------#
		#-------Definition of the concrete TargetFulfilmentResult dataType----------------#

		#-------Definition of the generic IntentConflictReport dataType----------------#
		IntentConflictReport:
		description: >-
		This data type is the "IntentConflictReport" data type without specialisations
		type: object
		properties:
		conflictType:
		type: string
		enum:
		- INTENT_CONFLICT
		- EXPECTATION_CONFLICT
		- TARGET_CONFLICT
		conflictField:
		type: string
		#-------Definition of the concrete IntentConflictReport dataType----------------#

		#-------Definition of the generic IntentFeasibilityCheckReport dataType----------------#
		IntentFeasibilityCheckReport:
		description: >-
		This data type is the "IntentFeasibilityCheckReport" data type without specialisations
		type: object
		properties:
		feasibilityCheckResult:
		type: string
		enum:
		- FEASIBLE
		- INFEASIBLE
		infeasibilityReason:
		description: ->
		An attribute which is used when feasibilityCheckResult is INFEASIBLE
		type: string
		#-------Definition of the concrete IntentFeasibilityCheckReport dataType----------------#

		#-------Definition of the generic IntentHandlingCapability dataType----------------#
		IntentHandlingCapability:
		type: object
		properties:
		intentHandlingCapabilityId:
		type: string
		supportedExpectationObjectType:
		type: string
		enum:
		- RAN_SUBNETWORK
		- EDGE_SERVICE_SUPPORT
		supportedExpectationTargetType:
		type: array
		items:
		$ref: "#/components/schemas/ExpectationTarget"
		#-------Definition of the concrete IntentHandlingCapability dataType----------------#

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

		@@ -241,6 +397,18 @@ components:
		type: array
		items:
		$ref: '#/components/schemas/Intent-Single'

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

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


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

		#----- Definitions in TS 28.312 for TS 28.532 --------------------------#

OpenAPI/TS28541_5GcNrm.yaml

+1088 −176

File changed.

Preview size limit exceeded, changes collapsed.

OpenAPI/TS28541_NrNrm.yaml

+146 −21

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:
		@@ -599,6 +591,75 @@ components:
		type: integer
		minValue:
		type: integer
		NTNTAClist:
		type: array
		items:
		$ref: '#/components/schemas/NrTac'
		Ephemeris:
		type: object
		oneOf:
		- $ref: '#/components/schemas/PositionVelocity'
		- $ref: '#/components/schemas/Orbital'
		properties:
		satelliteId:
		type: integer

		PositionVelocity:
		type: object
		properties:
		positionX:
		type: integer
		minimum: 0
		maximum: 604800
		positionY:
		type: integer
		minimum: 0
		maximum: 604800
		positionZ:
		type: integer
		minimum: 0
		maximum: 604800
		velocityVX:
		type: integer
		minimum: -131072
		maximum: 131071
		velocityVY:
		type: integer
		minimum: -131072
		maximum: 131071
		velocityVZ:
		type: integer
		minimum: -131072
		maximum: 131071

		Orbital:
		type: object
		properties:
		semiMajorAxis:
		type: integer
		minimum: 0
		maximum: 8589934591
		eccentricity:
		type: integer
		minimum: -524288
		maximum: 524287
		periapsis:
		type: integer
		minimum: 0
		maximum: 16777215
		longitude:
		type: integer
		minimum: 0
		maximum: 2097151
		inclination:
		type: integer
		minimum: -524288
		maximum: 524287
		meanAnomaly:
		type: integer
		minimum: 0
		maximum: 16777215

		#-------- Definition of abstract IOCs --------------------------------------------

		RrmPolicy_-Attr:
		@@ -949,7 +1010,7 @@ components:
		nrPci:
		$ref: '#/components/schemas/NrPci'
		nrTac:
		$ref: '#/components/schemas/NrTac'
		$ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac'
		arfcnDL:
		type: integer
		arfcnUL:
		@@ -1025,7 +1086,11 @@ components:
		- type: object
		properties:
		bWPlist:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
		type: array
		items:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
		maxItems: 12


		NrOperatorCellDu-Single:
		allOf:
		@@ -1039,7 +1104,7 @@ components:
		plmnInfoList:
		$ref: '#/components/schemas/PlmnInfoList'
		nrTac:
		$ref: '#/components/schemas/NrTac'
		$ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac'

		NRFrequency-Single:
		allOf:
		@@ -1190,10 +1255,19 @@ components:
		properties:
		rRMPolicyMaxRatio:
		type: integer
		default: 100
		minimum: 0
		maximum: 100
		rRMPolicyMinRatio:
		type: integer
		default: 0
		minimum: 0
		maximum: 100
		rRMPolicyDedicatedRatio:
		type: integer
		default: 0
		minimum: 0
		maximum: 100

		NRCellRelation-Single:
		allOf:
		@@ -1418,10 +1492,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:
		@@ -1870,6 +1944,45 @@ components:
		- $ref: '#/components/schemas/CCOParameters-Attr'
		- type: object

		NTNFunction-Single:
		allOf:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
		- type: object
		properties:
		attributes:
		type: object
		properties:
		nTNpLMNInfoList:
		$ref: '#/components/schemas/PlmnInfoList'
		nTNTAClist:
		$ref: '#/components/schemas/NrTacList'
		EphemerisInfoSet:
		$ref: '#/components/schemas/EphemerisInfoSet-Multiple'

		EphemerisInfoSet-Single:
		allOf:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
		- type: object
		properties:
		attributes:
		allOf:
		- type: object
		properties:
		EphemerisInfos:
		$ref: '#/components/schemas/Ephemeris-Multiple'

		Ephemeris-Single:
		allOf:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
		- type: object
		oneOf:
		- $ref: '#/components/schemas/PositionVelocity'
		- $ref: '#/components/schemas/Orbital'
		properties:
		satelliteId:
		type: integer


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

		SubNetwork-Multiple:
		@@ -2032,7 +2145,15 @@ components:
		type: array
		items:
		$ref: '#/components/schemas/EP_S1U-Single'
		EphemerisInfoSet-Multiple:
		type: array
		items:
		$ref: '#/components/schemas/EphemerisInfoSet-Single'

		Ephemeris-Multiple:
		type: array
		items:
		$ref: '#/components/schemas/Ephemeris-Single'
		#-------- Definitions in TS 28.541 for TS 28.532 ---------------------------------

		resources-nrNrm:
		@@ -2099,3 +2220,7 @@ components:
		- $ref: '#/components/schemas/CCOWeakCoverageParameters-Single'
		- $ref: '#/components/schemas/CCOPilotPollutionParameters-Single'
		- $ref: '#/components/schemas/CCOOvershootCoverageParameters-Single'
		- $ref: '#/components/schemas/NTNFunction-Single'
		- $ref: '#/components/schemas/EphemerisInfoSet-Single'
		- $ref: '#/components/schemas/Ephemeris-Single'