Maually rebase to address conflict (25cc4ed7) · Commits · SA5 – Management & Orchestration and Charging / Management and Orchestration APIs

OpenAPI/TS28104_MdaNrm.yaml

+20 −2

Original line number	Diff line number	Diff line
		@@ -14,13 +14,31 @@ components:
		schemas:

		#-------- Definition of types-----------------------------------------------------
		MDAType:
		type: string
		enum:
		- COVERAGEANALYTICS_COVERAGEPROBLEMANALYSIS
		- COVERAGEANALYTICS_PAGINGOPTIMIZATION
		- SLSANALYSIS_SERVICEEXPERIENCEANALYSIS
		- SLSANALYSIS_NETWORKSLICETHROUGHPUTANALYSIS
		- SLSANALYSIS_NETWORKSLICETRAFFICANALYSIS
		- SLSANALYSIS_E2ELATENCYANALYSIS
		- SLSANALYSIS_NETWORKSLICELOADANALYSIS
		- MDAASSISTEDFAULTMANAGEMENT_FAILUREPREDICTION
		- MDAASSISTEDENERGYSAVING_ENERGYSAVINGANALYSIS
		- MOBILITYMANAGEMENTANALYTICS_MOBILITYPERFORMANCEANALYSIS
		- MOBILITYMANAGEMENTANALYTICS_HANDOVEROPTIMIZATION
		- MAINTENANCE_MAINTENANCEANALYTICS
		- RESOURCEANALYTICS_VIRTUALIZEDRESOURCEUTILIZATIONANALYSISNF
		- RESOURCEANALYTICS_PHYISCALRESOURCEUTILIZATIONANALYSISNF
		- RESOURCEANALYTICS_5GCCONTROLPLANECONGESTIONANALYSIS
		- PREDICTIONS_PMDATA

		MDATypes:
		type: array
		uniqueItems: true
		items:
		type: string
		readOnly: true
		$ref: '#/components/schemas/MDAType'

		MDAOutputs:
		type: array

OpenAPI/TS28105_AiMlNrm.yaml

+51 −14

Original line number	Diff line number	Diff line
		@@ -86,9 +86,11 @@ components:
		isSupportedForTraining:
		type: boolean
		readOnly: true
		default: FALSE
		isSupportedForTesting:
		type: boolean
		readOnly: true
		default: FALSE

		ManagedActivationScope:
		oneOf:
		@@ -118,8 +120,7 @@ components:
		type: object
		properties:
		aIMLInferenceName:
		type: string
		readOnly: true
		$ref: '#/components/schemas/AIMLInferenceName'
		capabilityName:
		type: string
		readOnly: true
		@@ -157,7 +158,7 @@ components:
		type: string
		readOnly: true
		aIMLInferenceName:
		type: string
		$ref: '#/components/schemas/AIMLInferenceName'
		readOnly: true
		inferenceOutputTime:
		type: array
		@@ -170,6 +171,22 @@ components:
		outputResult:
		description: A map (list of key-value pairs) for Inference result name and it's value
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet'
		AIMLInferenceName:
		oneOf:
		- $ref: 'TS28104_MdaNrm.yaml#/components/schemas/MDAType'
		- $ref: '#/components/schemas/NwdafAnalyticsType'
		- $ref: '#/components/schemas/NgRanInferenceType'
		- $ref: '#/components/schemas/VSExtensionType'
		NwdafAnalyticsType:
		$ref: 'TS29520_Nnwdaf_EventsSubscription.yaml#/components/schemas/NwdafEvent'
		NgRanInferenceType:
		type: string
		enum:
		- NG_RAN_NETWORK_ENERGY_SAVING
		- NG_RAN_LOAD_BALANCING
		- NG_RAN_ MOBILITY_OPTIMIZATION
		VSExtensionType:
		type: string

		#-------- Definition of types for name-containments ------
		SubNetwork-ncO-AiMlNrm:
		@@ -244,8 +261,7 @@ components:
		- type: object
		properties:
		aIMLInferenceName:
		type: string
		readOnly: true
		$ref: '#/components/schemas/AIMLInferenceName'
		candidateTrainingDataSource:
		type: array
		uniqueItems: true
		@@ -284,14 +300,17 @@ components:
		properties:
		priority:
		type: integer
		default: 0
		terminationConditions:
		type: string
		progressStatus:
		$ref: '#/components/schemas/ProcessMonitor'
		cancelProcess:
		type: boolean
		default: FALSE
		suspendProcess:
		type: boolean
		default: FALSE
		trainingRequestRef: ## Figure 7.3a.1.1.1-1 has no such pointer
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo'
		trainingReportRef:
		@@ -380,8 +399,10 @@ components:
		$ref: '#/components/schemas/RequestStatus'
		cancelRequest:
		type: boolean
		default: FALSE
		suspendRequest:
		type: boolean
		default: FALSE
		mLModelRef:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'
		mLModelCoordinationGroupRef:
		@@ -420,8 +441,10 @@ components:
		$ref: '#/components/schemas/RequestStatus'
		cancelRequest:
		type: boolean
		default: FALSE
		suspendRequest:
		type: boolean
		default: FALSE
		mLModelToLoadRef:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'

		@@ -435,7 +458,7 @@ components:
		- type: object
		properties:
		aIMLInferenceName:
		type: string
		$ref: '#/components/schemas/AIMLInferenceName'
		policyForLoading:
		$ref: '#/components/schemas/AIMLManagementPolicy'
		mLModelRef:
		@@ -454,8 +477,10 @@ components:
		$ref: '#/components/schemas/ProcessMonitor'
		cancelProcess:
		type: boolean
		default: FALSE
		suspendProcess:
		type: boolean
		default: FALSE
		mLModelLoadingRequestRef:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'
		mLModelLoadingPolicyRef:
		@@ -475,8 +500,7 @@ components:
		type: string
		readOnly: true
		aIMLInferenceName:
		type: string
		readOnly: true
		$ref: '#/components/schemas/AIMLInferenceName'
		mLModelVersion:
		type: string
		readOnly: true
		@@ -487,12 +511,17 @@ components:
		runTimeContext:
		$ref: '#/components/schemas/MLContext'
		supportedPerformanceIndicators:
		type: array
		uniqueItems: true
		items:
		$ref: '#/components/schemas/SupportedPerfIndicator'
		minItems: 1
		mLCapabilitiesInfoList:
		type: array
		uniqueItems: true
		items:
		$ref: '#/components/schemas/MLCapabilityInfo'
		minItems: 1
		retrainingEventsMonitorRef:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
		sourceTrainedMLModelRef:
		@@ -521,7 +550,11 @@ components:
		type: object
		properties:
		memberMLModelRefList:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo'
		type: array
		uniqueItems: true
		items:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'
		minItems: 2

		## 7.3a.4.1 IOC
		MLUpdateFunction-Single:
		@@ -574,8 +607,10 @@ components:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow'
		cancelRequest:
		type: boolean
		default: FALSE
		suspendRequest:
		type: boolean
		default: FALSE
		mLUpdateProcessRef:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'
		mLModelRefList:
		@@ -593,8 +628,10 @@ components:
		$ref: '#/components/schemas/ProcessMonitor'
		cancelProcess:
		type: boolean
		default: FALSE
		suspendProcess:
		type: boolean
		default: FALSE
		mLModelRefList:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo'
		mLUpdateRequestRefList:

OpenAPI/TS28312_IntentNrm.yaml

+7 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ components:
		intentExpectations:
		type: array
		uniqueItems: true
		minItems: 1
		items:
		type: object
		oneOf:
		@@ -104,6 +105,7 @@ components:
		intentHandlingCapabilityList:
		type: array
		uniqueItems: true
		minItems: 1
		items:
		$ref: '#/components/schemas/IntentHandlingCapability'
		Intent:
		@@ -130,6 +132,7 @@ components:
		expectationTargets:
		type: array
		uniqueItems: true
		minItems: 1
		items:
		$ref: '#/components/schemas/ExpectationTarget'
		contextSelectivity:
		@@ -294,6 +297,7 @@ components:
		oneOf:
		- type: array
		uniqueItems: true
		minItems: 1
		items:
		$ref: "#/components/schemas/ValueRangeType"
		- $ref: "#/components/schemas/ValueRangeType"
		@@ -321,6 +325,7 @@ components:
		oneOf:
		- type: array
		uniqueItems: true
		minItems: 1
		items:
		$ref: "#/components/schemas/ValueRangeType"
		- $ref: "#/components/schemas/ValueRangeType"
		@@ -338,6 +343,7 @@ components:
		expectationFulfilmentResult:
		type: array
		uniqueItems: true
		minItems: 1
		items:
		$ref: '#/components/schemas/ExpectationFulfilmentResult'
		#-------Definition of the concrete IntentFulfilmentReport dataType----------------#
		@@ -460,6 +466,7 @@ components:
		supportedExpectationTargetNames:
		type: array
		uniqueItems: true
		minItems: 1
		items:
		type: string
		readOnly: true

OpenAPI/TS28536_CoslaNrm.yaml

+3 −0

Original line number	Diff line number	Diff line
		@@ -75,6 +75,7 @@ components:
		AssuranceTargetList:
		type: array
		uniqueItems: true
		minItems: 1
		items:
		$ref: '#/components/schemas/AssuranceTarget'

		@@ -94,6 +95,7 @@ components:
		AssuranceGoalStatusList:
		type: array
		uniqueItems: true
		minItems: 1
		items:
		$ref: '#/components/schemas/AssuranceGoalStatus'

		@@ -113,6 +115,7 @@ components:
		AssuranceTargetStatusList:
		type: array
		uniqueItems: true
		minItems: 1
		items:
		$ref: '#/components/schemas/AssuranceTargetStatus'

OpenAPI/TS28538_EdgeNrm.yaml

+5 −9

Original line number	Diff line number	Diff line
		@@ -99,13 +99,6 @@ components:
		readOnly: true
		secCredential:
		type: string
		Duration:
		type: object
		properties:
		startTime:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
		endTime:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
		EASServicePermission:
		type: string
		description: any of enumerated value
		@@ -278,6 +271,7 @@ components:
		$ref: '#/components/schemas/RelocationTriggerInfo'
		relocationRejectByASP:
		type: boolean
		default: FALSE
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
		EASProfile-Single:
		allOf:
		@@ -294,7 +288,7 @@ components:
		type: string
		readOnly: true
		eASSchedule:
		$ref: '#/components/schemas/Duration'
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindowRo'
		eASGeographicalServiceArea:
		$ref: '#/components/schemas/GeoLoc'
		eASTopologicalServiceArea:
		@@ -306,6 +300,7 @@ components:
		eASServiceContinuitySupport:
		type: boolean
		readOnly: true
		default: FALSE
		eASDNAI:
		type: string
		readOnly: true
		@@ -392,7 +387,7 @@ components:
		softwareImageInfo:
		$ref: '#/components/schemas/SoftwareImageInfo'
		eASSchedule:
		$ref: '#/components/schemas/Duration'
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow'
		eASFeature:
		$ref: '#/components/schemas/EASFeature'
		relocationPolicy:
		@@ -477,6 +472,7 @@ components:
		type: string
		coordinatedEASDiscovery:
		type: boolean
		default: FALSE
		coordinatedACR:
		type: boolean
		eDNAffinity: