Coderator modertaor address the conflict issues (5d1bd470) · Commits · SA5 – Management & Orchestration and Charging / Management and Orchestration APIs

OpenAPI/TS28104_MdaNrm.yaml

+2 −1

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ components:
		- SLS_ANALYSIS_NETWORK_SLICE_TRAFFIC_ANALYSIS
		- SLS_ANALYSIS_E2E_LATENCY_ANALYSIS
		- SLS_ANALYSIS_NETWORK_SLICE_LOAD_ANALYSIS
		- UE_THROUGHPUT_ANALYSIS_TRAFFIC_CONGESTION_PROBLEM_ANALYSIS
		- SLS_ANALYSIS_EDGE_APPLICATION_DEPLOYMENT_LOCATION_ANALYSIS
		- SLS_ANALYSIS_EDGE_COMPUTING_PERFORMANCE_ANALYSIS
		- SLS_ANALYSIS_TRAFFIC_CONGESTION_PREDICTION_ANALYSIS
		@@ -37,7 +38,7 @@ components:
		- RESOURCE_ANALYTICS_PHYSICAL_RESOURCE_UTILIZATION_ANALYSIS_NF
		- RESOURCE_ANALYTICS_5GC_CONTROL_PLANE_CONGESTION_ANALYSIS
		- PREDICTIONS_PM_DATA
		- UE_THROUGHPUT_ANALYSIS_TRAFFIC_CONGESTION_PROBLEM_ANALYSIS
		- ATSSS_PERFORMANCE_TRAFFIC_STEERING_ANALYTICS
		- CORRELATION_ANALYTICS_TRAINING_DATA_ANALYSIS
		- CORRELATION_ANALYTICS_NF_SCALING_DIMENSIONING_DATA_ANALYSIS

OpenAPI/TS28104_MdaReport.yaml

+34 −5

Original line number	Diff line number	Diff line
		@@ -46,13 +46,14 @@ components:
		$ref: 'TS28104_MdaNrm.yaml#/components/schemas/MDAType'
		mDAOutputList:
		oneOf:
		- $ref: '#/components/schemas/CoverageProblemAnalysisoutput'
		- $ref: '#/components/schemas/MobilityPerformanceAnalysisoutput'
		- $ref: '#/components/schemas/CoverageProblemAnalysisOutput'
		- $ref: '#/components/schemas/MobilityPerformanceAnalysisOutput'
		- $ref: '#/components/schemas/TrainingDataAnalysisOutput'
		- $ref: '#/components/schemas/NFScalingDimensioningDataAnalysisOutput'
		- $ref: '#/components/schemas/PMDataOutput'
		- $ref: '#/components/schemas/FailurePredictionOutput'
		- $ref: '#/components/schemas/PagingOptimizationAnalysisOutput'
		- $ref: '#/components/schemas/TrafficCongestionProblemAnalysisOutput'
		- type: array
		uniqueItems: true
		items:
		@@ -146,7 +147,7 @@ components:


		#-------- Definition of specific MobilityPerformanceAnalysis MDAoutput -----------------------------
		MobilityPerformanceAnalysisoutput:
		MobilityPerformanceAnalysisOutput:
		type: object
		properties:
		mobilityPerformanceIssueIdentifier:
		@@ -162,7 +163,7 @@ components:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea'

		#-------- Definition of specific CoverageProblemAnalysis MDAoutput -----------------------------
		CoverageProblemAnalysisoutput:
		CoverageProblemAnalysisOutput:
		type: object
		properties:
		coverageProblemId:
		@@ -392,6 +393,34 @@ components:
		items:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow'

		#-------- Definition of specific UEThroughputAnalysis MDAoutput -----------------------------
		TrafficCongestionProblemAnalysisOutput:
		type: object
		properties:
		trafficCongestionId:
		type: string
		trafficCongestionType:
		type: string
		enum:
		- NON_REGULAR_TRAFFIC_CONGESTION
		- REGULAR_TRAFFIC_CONGESTION
		timeDuration:
		type: array
		items:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow'
		trafficCongestionAreas:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea'
		recommendedActions:
		type: array
		uniqueItems: true
		items:
		$ref: '#/components/schemas/RecommendedAction'
		severityLevel:
		type: string
		enum:
		- SLIGHT_CONGESTION
		- MODERATE_CONGESTION
		- SEVERE_CONGESTION

OpenAPI/TS28111_FaultNotifications.yaml

+0 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,6 @@ paths:
		- $ref: 'TS28111_FaultNrm.yaml#/components/schemas/NotifyNewAlarm'
		- $ref: 'TS28111_FaultNrm.yaml#/components/schemas/NotifyNewSecAlarm'
		- $ref: 'TS28111_FaultNrm.yaml#/components/schemas/NotifyClearedAlarm'
		- $ref: 'TS28111_FaultNrm.yaml#/components/schemas/NotifyChangedAlarm'
		- $ref: 'TS28111_FaultNrm.yaml#/components/schemas/NotifyChangedAlarmGeneral'
		- $ref: 'TS28111_FaultNrm.yaml#/components/schemas/NotifyChangedSecAlarmGeneral'
		- $ref: 'TS28111_FaultNrm.yaml#/components/schemas/NotifyCorrelatedNotificationChanged'

OpenAPI/TS28111_FaultNrm.yaml

+16 −21

Original line number	Diff line number	Diff line
		@@ -218,6 +218,12 @@ components:
		securityAlarmDetector:
		type: string
		readOnly: true
		clearingType:
		type: string
		enum:
		- MANUAL
		- AUTOMATIC
		default: AUTOMATIC
		AlarmList-Single:
		allOf:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
		@@ -252,7 +258,6 @@ components:
		type: string
		enum:
		- notifyNewAlarm
		- notifyChangedAlarm
		- notifyChangedAlarmGeneral
		- notifyAckStateChanged
		- notifyCorrelatedNotificationChanged
		@@ -308,6 +313,11 @@ components:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet'
		rootCauseIndicator:
		type: boolean
		clearingType:
		type: string
		enum:
		- MANUAL
		- AUTOMATIC
		NotifyNewSecAlarm:
		allOf:
		- $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader'
		@@ -345,6 +355,11 @@ components:
		type: string
		securityAlarmDetector:
		type: string
		clearingType:
		type: string
		enum:
		- MANUAL
		- AUTOMATIC
		NotifyClearedAlarm:
		allOf:
		- $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader'
		@@ -371,26 +386,6 @@ components:
		type: string
		clearSystemId:
		type: string
		NotifyChangedAlarm:
		allOf:
		- $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader'
		- type: object
		required:
		- alarmId
		- alarmType
		- probableCause
		- perceivedSeverity
		properties:
		alarmId:
		$ref: '#/components/schemas/AlarmId'
		alarmType:
		$ref: '#/components/schemas/AlarmType'
		probableCause:
		$ref: '#/components/schemas/ProbableCause'
		specificProblem:
		$ref: '#/components/schemas/SpecificProblem'
		perceivedSeverity:
		$ref: '#/components/schemas/PerceivedSeverity'
		NotifyChangedAlarmGeneral:
		allOf:
		- $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader'

OpenAPI/TS28312_IntentExpectations.yaml

+87 −85

Original line number	Diff line number	Diff line
		@@ -22,9 +22,9 @@ components:
		expectationId:
		type: string
		expectationVerb:
		$ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb"
		$ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb'
		expectationObject:
		$ref: "#/components/schemas/RadioNetworkExpectationObject"
		$ref: '#/components/schemas/RadioNetworkExpectationObject'
		expectationTargets:
		type: array
		uniqueItems: true
		@@ -41,9 +41,9 @@ components:
		- $ref: '#/components/schemas/HighDLPrbLoadRatioTarget'
		- $ref: '#/components/schemas/AveULPrbLoadTarget'
		- $ref: '#/components/schemas/AveDLPrbLoadTarget'
		- $ref: "#/components/schemas/RANEnergyConsumptionTarget"
		- $ref: "#/components/schemas/RANEnergyEfficiencyTarget"
		- $ref: "#/components/schemas/ActiveUEsNumTarget"
		- $ref: '#/components/schemas/RANEnergyConsumptionTarget'
		- $ref: '#/components/schemas/RANEnergyEfficiencyTarget'
		- $ref: '#/components/schemas/ActiveUEsNumTarget'
		- $ref: '#/components/schemas/PRBsTarget'
		- $ref: '#/components/schemas/InterRAThandoverTarget'
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget'
		@@ -58,6 +58,8 @@ components:
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context'
		required:
		- expectationId
		- expectationObject
		- expectationTargets
		RadioServiceExpectation:
		description: >-
		This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for radio service delivering
		@@ -66,9 +68,9 @@ components:
		expectationId:
		type: string
		expectationVerb:
		$ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb"
		$ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb'
		expectationObject:
		$ref: "#/components/schemas/RadioServiceExpectationObject"
		$ref: '#/components/schemas/RadioServiceExpectationObject'
		expectationTargets:
		type: array
		uniqueItems: true
		@@ -91,6 +93,8 @@ components:
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context'
		required:
		- expectationId
		- expectationObject
		- expectationTargets
		EdgeServiceSupportExpectation:
		description: >-
		This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for service deployment
		@@ -129,6 +133,8 @@ components:
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context'
		required:
		- expectationId
		- expectationObject
		- expectationTargets
		5GCNetworkExpectation:
		description: >-
		This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for 5GC network delivering
		@@ -137,23 +143,20 @@ components:
		expectationId:
		type: string
		expectationVerb:
		$ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb"
		expectationObjects:
		type: array
		uniqueItems: true
		items:
		$ref: "#/components/schemas/5GCNetworkExpectationObject"
		$ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb'
		expectationObject:
		$ref: '#/components/schemas/5GCNetworkExpectationObject'
		expectationTargets:
		type: array
		uniqueItems: true
		items:
		type: object
		oneOf:
		- $ref: "#/components/schemas/MaxNumberofPDUsessionsTarget"
		- $ref: "#/components/schemas/MaxNumberofRegisteredsubscribersTarget"
		- $ref: "#/components/schemas/IncomingDataTarget"
		- $ref: "#/components/schemas/OutgoingDataTarget"
		- $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget"
		- $ref: '#/components/schemas/MaxNumberofPDUsessionsTarget'
		- $ref: '#/components/schemas/MaxNumberofRegisteredsubscribersTarget'
		- $ref: '#/components/schemas/IncomingDataTarget'
		- $ref: '#/components/schemas/OutgoingDataTarget'
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget'
		expectationContexts:
		type: array
		uniqueItems: true
		@@ -162,7 +165,7 @@ components:
		oneOf:
		- $ref: '#/components/schemas/StartTimeContext'
		- $ref: '#/components/schemas/ResourceSharingLevelContext'
		- $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context"
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context'
		required:
		- expectationId
		NetworkMaintenanceExpectation:
		@@ -173,12 +176,9 @@ components:
		expectationId:
		type: string
		expectationVerb:
		$ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb"
		expectationObjects:
		type: array
		uniqueItems: true
		items:
		$ref: "#/components/schemas/NetworkMaintenanceExpectationObject"
		$ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb'
		expectationObject:
		$ref: '#/components/schemas/NetworkMaintenanceExpectationObject'
		expectationTargets:
		type: array
		uniqueItems: true
		@@ -196,13 +196,13 @@ components:
		- $ref: '#/components/schemas/HighDLPrbLoadRatioTarget'
		- $ref: '#/components/schemas/AveULPrbLoadTarget'
		- $ref: '#/components/schemas/AveDLPrbLoadTarget'
		- $ref: "#/components/schemas/RANEnergyConsumptionTarget"
		- $ref: "#/components/schemas/RANEnergyEfficiencyTarget"
		- $ref: "#/components/schemas/MaxNumberofPDUsessionsTarget"
		- $ref: "#/components/schemas/MaxNumberofRegisteredsubscribersTarget"
		- $ref: "#/components/schemas/IncomingDataTarget"
		- $ref: "#/components/schemas/OutgoingDataTarget"
		- $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget"
		- $ref: '#/components/schemas/RANEnergyConsumptionTarget'
		- $ref: '#/components/schemas/RANEnergyEfficiencyTarget'
		- $ref: '#/components/schemas/MaxNumberofPDUsessionsTarget'
		- $ref: '#/components/schemas/MaxNumberofRegisteredsubscribersTarget'
		- $ref: '#/components/schemas/IncomingDataTarget'
		- $ref: '#/components/schemas/OutgoingDataTarget'
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget'
		expectationContexts:
		type: array
		uniqueItems: true
		@@ -210,9 +210,11 @@ components:
		type: object
		oneOf:
		- $ref: '#/components/schemas/MaintenanceTimeContext'
		- $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context"
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context'
		required:
		- expectationId
		- expectationObject
		- expectationTargets
		#-------Definition of the IntentExpectation dataType ----------#

		#-------Definition of the scenario specific ExpectationObject dataType ----------#
		@@ -241,7 +243,7 @@ components:
		- $ref: '#/components/schemas/DlFrequencyContext'
		- $ref: '#/components/schemas/UlFrequencyContext'
		- $ref: '#/components/schemas/RATContext'
		- $ref: "#/components/schemas/UEGroupContext"
		- $ref: '#/components/schemas/UEGroupContext'
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context'
		RadioServiceExpectationObject:
		description: >-
		@@ -306,13 +308,13 @@ components:
		items:
		type: object
		oneOf:
		- $ref: "#/components/schemas/NfTypeContext"
		- $ref: "#/components/schemas/NfInstanceLocationContext"
		- $ref: "#/components/schemas/PLMNContext"
		- $ref: "#/components/schemas/TaiContext"
		- $ref: "#/components/schemas/ServingScopeContext"
		- $ref: "#/components/schemas/DnnContext"
		- $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context"
		- $ref: '#/components/schemas/NfTypeContext'
		- $ref: '#/components/schemas/NfInstanceLocationContext'
		- $ref: '#/components/schemas/PLMNContext'
		- $ref: '#/components/schemas/TaiContext'
		- $ref: '#/components/schemas/ServingScopeContext'
		- $ref: '#/components/schemas/DnnContext'
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context'
		NetworkMaintenanceExpectationObject:
		description: >-
		This data type is the "ExpectationObject" data type with specialisations for NetworkMaintenanceExpectation
		@@ -326,22 +328,22 @@ components:
		items:
		type: object
		oneOf:
		- $ref: "#/components/schemas/MaintenanceVersionContext"
		- $ref: "#/components/schemas/MaintenanceOrderContext"
		- $ref: "#/components/schemas/MaintenanceTypeContext"
		- $ref: "#/components/schemas/NfTypeContext"
		- $ref: "#/components/schemas/NfInstanceLocationContext"
		- $ref: "#/components/schemas/PLMNContext"
		- $ref: "#/components/schemas/TaiContext"
		- $ref: "#/components/schemas/ServingScopeContext"
		- $ref: "#/components/schemas/DnnContext"
		- $ref: '#/components/schemas/MaintenanceVersionContext'
		- $ref: '#/components/schemas/MaintenanceOrderContext'
		- $ref: '#/components/schemas/MaintenanceTypeContext'
		- $ref: '#/components/schemas/NfTypeContext'
		- $ref: '#/components/schemas/NfInstanceLocationContext'
		- $ref: '#/components/schemas/PLMNContext'
		- $ref: '#/components/schemas/TaiContext'
		- $ref: '#/components/schemas/ServingScopeContext'
		- $ref: '#/components/schemas/DnnContext'
		- $ref: '#/components/schemas/CoverageAreaPolygonContext'
		- $ref: '#/components/schemas/CoverageTACContext'
		- $ref: '#/components/schemas/PLMNContext'
		- $ref: '#/components/schemas/DlFrequencyContext'
		- $ref: '#/components/schemas/UlFrequencyContext'
		- $ref: '#/components/schemas/RATContext'
		- $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context"
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context'
		#-------Definition of the ExpectationObject dataType ----------#


		@@ -506,7 +508,7 @@ components:
		contextCondition:
		type: string
		enum:
		- Is_less_than
		- IS_LESS_THAN
		contextValueRange:
		type: number
		LowDLRANUEThptRatioTarget:
		@@ -733,7 +735,7 @@ components:
		targetName:
		type: string
		enum:
		- PRBS
		- pRBS
		targetCondition:
		type: string
		enum:
		@@ -749,7 +751,7 @@ components:
		targetName:
		type: string
		enum:
		- INTERRATHANDOVER
		- InterRATHandover
		targetCondition:
		type: string
		enum:
		@@ -1233,7 +1235,7 @@ components:
		type: array
		uniqueItems: true
		items:
		$ref: "TS28623_ComDefs.yaml#/components/schemas/Tac"
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/Tac'
		NfTypeContext:
		description: >-
		This data type is the "ObjectContext" data type with specialisations for NfTypeContext
		@@ -1251,7 +1253,7 @@ components:
		type: array
		uniqueItems: true
		items:
		$ref: "TS28541_5GcNrm.yaml#/components/schemas/NFType"
		$ref: 'TS28541_5GcNrm.yaml#/components/schemas/NFType'
		NfInstanceLocationContext:
		description: >-
		This data type is the "ObjectContext" data type with specialisations for NfInstanceLocationContext
		@@ -1287,7 +1289,7 @@ components:
		type: array
		uniqueItems: true
		items:
		$ref: "TS28623_GenericNrm.yaml#/components/schemas/Tai"
		$ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai'
		ServingScopeContext:
		description: >-
		This data type is the "ObjectContext" data type with specialisations for ServingScopeContext

Admin message