Code moderator resolve the implementation conflict issue (8baa6d86) · Commits · SA5 – Management & Orchestration and Charging / Management and Orchestration APIs

OpenAPI/TS28104_MdaReport.yaml

+26 −4

Original line number	Diff line number	Diff line
		@@ -152,16 +152,38 @@ components:
		properties:
		mobilityPerformanceIssueIdentifier:
		type: integer
		mobilityPerformanceIssueType:
		type: string
		enum:
		- NSA_ISSUE
		- SA_ISSUE
		mobilityPerformanceIssue:
		type: string
		enum:
		- TOO-EARLY_HANDOVER
		- TOO-LATE_HANDOVER
		- PINGPONG_HANDOVER
		- TOO-EARLY_PSCELL_CHANGE
		- TOO-LATE_PSCELL_CHANGE
		- TOO-EARLY_PSCELL_ CONDITIONAL_CHANGE
		- TOO-LATE_PSCELL_CONDITIONAL_CHANGE
		mobilityPerformanceIssueRootCause:
		type: string
		enum:
		- TooLongMobilityInterruptionTime
		- PoorCoverageOfTheCelledge
		- InappropriateHandoverParameters
		- TOO_LONG_MOBILITY_INTERRUPTION_TIME
		- POOR_COVERAGE_OF_THE_CELL_EDGE
		- INAPPROPRIATE_HANDOVER_PARAMETERS
		- HIGH_INTERFERENCE
		- INSUFFICIENT TRANSPORT_RESOURCES
		- CAPABILITY_ISSUE
		- Other
		mobilityPerformanceIssueLocation:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea'

		recommendedActions:
		type: array
		uniqueItems: true
		items:
		$ref: '#/components/schemas/RecommendedAction'
		#-------- Definition of specific CoverageProblemAnalysis MDAoutput -----------------------------
		CoverageProblemAnalysisOutput:
		type: object

OpenAPI/TS28312_IntentExpectations.yaml

+112 −2

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@ components:
		oneOf:
		- $ref: '#/components/schemas/TargetAssuranceTimeContext'
		- $ref: '#/components/schemas/SchedulingTimeContext'
		- $ref: '#/components/schemas/PrbHighLoadRatioContext'
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context'
		required:
		- expectationId
		@@ -82,6 +83,7 @@ components:
		- $ref: '#/components/schemas/DLThptPerUETarget'
		- $ref: '#/components/schemas/ULThptPerUETarget'
		- $ref: '#/components/schemas/NumberofUEsTarget'
		- $ref: '#/components/schemas/ServiceAvailabilityTarget'
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget'
		expectationContexts:
		type: array
		@@ -90,6 +92,7 @@ components:
		type: object
		oneOf:
		- $ref: '#/components/schemas/SchedulingTimeContext'
		- $ref: '#/components/schemas/AssuranceDurationContext'
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context'
		required:
		- expectationId
		@@ -156,6 +159,7 @@ components:
		- $ref: '#/components/schemas/MaxNumberofRegisteredsubscribersTarget'
		- $ref: '#/components/schemas/IncomingDataTarget'
		- $ref: '#/components/schemas/OutgoingDataTarget'
		- $ref: '#/components/schemas/LatencyTarget'
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget'
		expectationContexts:
		type: array
		@@ -266,9 +270,11 @@ components:
		- $ref: '#/components/schemas/DlFrequencyContext'
		- $ref: '#/components/schemas/UlFrequencyContext'
		- $ref: '#/components/schemas/CellContext'
		- $ref: '#/components/schemas/GeoCoordinateContext'
		- $ref: '#/components/schemas/CivicAreaContext'
		- $ref: '#/components/schemas/ServiceTypeContext'
		- $ref: '#/components/schemas/UEGroupContext'
		- $ref: '#/components/schemas/GeoCoordinateContext'

		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context'
		EdgeServiceSupportExpectationObject:
		description: >-
		@@ -314,6 +320,7 @@ components:
		- $ref: '#/components/schemas/TaiContext'
		- $ref: '#/components/schemas/ServingScopeContext'
		- $ref: '#/components/schemas/DnnContext'
		- $ref: '#/components/schemas/PreferredUPFContext'
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context'
		NetworkMaintenanceExpectationObject:
		description: >-
		@@ -776,6 +783,22 @@ components:
		- IS_LESS_THAN
		targetValueRange:
		type: integer
		ServiceAvailabilityTarget:
		description: >-
		describes the service availability target for the Radio Service that the intent expectation is applied.
		The detailed definition for service availability sees communication service availability defined in clause 3.1 of TS 22.261
		type: object
		properties:
		targetName:
		type: string
		enum:
		- ServiceAvailability
		targetCondition:
		type: string
		enum:
		- IS_GREATER_THAN
		targetValueRange:
		type: number
		DLThptPerUETarget:
		description: >-
		This data type is the "ExpectationTarget" data type with specialisations for DLThptPerUETarget. It describes the DL throughput target by the per UE for the
		@@ -971,6 +994,23 @@ components:
		- IS_LESS_THAN
		targetValueRange:
		type: integer
		LatencyTarget:
		description: >-
		This data type is the "ExpectationTarget" data type with specialisations for LatencyTarget.
		It represents the latency target for the core network service (ending at the UPF) that the
		intent expectation is applied.
		type: object
		properties:
		targetName:
		type: string
		enum:
		- Latency
		targetCondition:
		type: string
		enum:
		- IS_LESS_THAN
		targetValueRange:
		type: integer
		MaintenanceVersionTarget:
		description: >-
		This data type is the "ExpectationTarget" data type with specialisations for Maintenance Version Target. It describes the maintenance version target for the network maintenance, such as target version of the maintenance object after maintenance.
		@@ -1109,6 +1149,24 @@ components:
		- IS_EQUAL_TO
		contextValueRange:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate'
		CivicAreaContext:
		description: >-
		It describes the coverage areas for the RAN SubNetwork or Radio Service that the intent expectation is applied in the form of civic area.
		The civic area supports civic address (e.g. streets, districts, seats, etc.) or location label (e.g. hotel name, school name)
		type: object
		properties:
		contextAttribute:
		type: string
		enum:
		- CivicArea
		contextCondition:
		type: string
		enum:
		- IS_ALL_OF
		contextValueRange:
		type: array
		items:
		$ref: 'TS28312_IntentNrm.yaml#/components/schemas/CivicArea'
		DlFrequencyContext:
		description: >-
		This data type is the "Context" data type with specialisations for Object context "DLFrequencyContext". It describes the downlink frequency information (RF reference
		@@ -1326,6 +1384,24 @@ components:
		uniqueItems: true
		items:
		type: string
		PreferredUPFContext:
		description: >-
		This data type is the "ObjectContext" data type with specialisations for PreferredUPFContext
		type: object
		properties:
		contextAttribute:
		type: string
		enum:
		- PreferredUPF
		contextCondition:
		type: string
		enum:
		- IS_ALL_OF
		contextValueRange:
		type: array
		uniqueItems: true
		items:
		type: string
		MaintenanceVersionContext:
		description: >-
		This data type is the "ObjectContext" data type with specialisations for MaintenanceVersionContext. It describes the scope of the maintenance objects based on software version.
		@@ -1478,6 +1554,25 @@ components:
		- IS_EQUAL_TO
		contextValueRange:
		$ref: "TS28541_NrNrm.yaml#/components/schemas/Sst"
		PrbHighLoadRatioContext:
		description: >-
		This data type describes the load condition (i.e. PrbHighLoadRatio) for the radio network
		that the intent expectation is applied. The detailed PrbHighLoadRatio see PrbHighLoadRatio defined in TS 28.554
		type: object
		properties:
		contextAttribute:
		type: string
		enum:
		- prbHighLoadRatio
		contextCondition:
		type: string
		enum:
		- IS_GREATER_THAN
		contextValueRange:
		type: integer
		description: unit is %
		minimum: 0
		maximum: 100
		SchedulingTimeContext:
		description: >-
		This data type is the "ExpectationContext" data type with specialisations for SchedulingTimeContext.It describes
		@@ -1495,6 +1590,21 @@ components:
		- IS_ALL_OF
		contextValueRange:
		$ref: "TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime"
		AssuranceDurationContext:
		description: >-
		It describes the time duration at which the radio service instance should be scheduled to be delivered and available.
		type: object
		properties:
		contextAttribute:
		type: string
		enum:
		- AssuranceDuration
		contextCondition:
		type: string
		enum:
		- S_EQUAL_TO
		contextValueRange:
		type: integer
		StartTimeContext:
		description: >-
		This data type is the "ExpectationContext" data type with specialisations for StartTimeContext

OpenAPI/TS28312_IntentNrm.yaml

+246 −13

Original line number	Diff line number	Diff line
		@@ -88,6 +88,8 @@ components:
		default: false
		intentHandlingInfo:
		$ref: '#/components/schemas/IntentHandlingInfo'
		intentInterpretationAssistanceInfo:
		$ref: '#/components/schemas/IntentInterpretationAssistanceInfo'
		intentReportReference:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'
		intentUtilityFormulaRef:
		@@ -139,6 +141,17 @@ components:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
		- type: object
		properties:
		intentHandlingScope:
		type: array
		uniqueItems: true
		items:
		$ref: '#/components/schemas/IntentHandlingScope'
		supportedNegotiationFunctionalities:
		type: array
		uniqueItems: true
		minimum: 1
		items:
		$ref: '#/components/schemas/NegotiationFunctionality'
		intentHandlingCapabilityList:
		type: array
		uniqueItems: true
		@@ -274,6 +287,7 @@ components:
		type: string
		enum:
		- FEASIBILITYCHECK
		- FEASIBILITYCHECK_WITH_RECOMMENDATIONS
		- FULFILMENT_WITHOUT_NEGOTIATION
		- EXPLORATION
		- FULFILMENT_WITH_NEGOTIATION
		@@ -290,13 +304,11 @@ components:
		type: string
		readOnly: true
		enum:
		- ACKNOWLEDGED
		- COMPLIANT
		- RECEIVED
		- DEGRADED
		- SUSPENDED
		- TERMINATED
		- FULFILMENTFAILED
		default: ACKNOWLEDGED
		default: RECEIVED
		description: It describes the current progress of or the reason for not achieving fulfilment
		for the intent, intentExpectation or expectationTarget.
		An attribute which is used when FulfilmentInfo is implemented for IntentFulfilmentInfo
		@@ -319,6 +331,29 @@ components:
		description: An attribute which is used when FulfilmentInfo is implemented for IntentFulfilmentInfo
		required:
		- fulfilmentStatus

		FulfilmentStatisticsInfo:
		type: object
		properties:
		expectationObjectFulfilmentInfo:
		type: array
		uniqueItems: true
		items:
		$ref: '#/components/schemas/Distribution'
		expectationTemporalFulfilmentInfo:
		type: array
		uniqueItems: true
		items:
		$ref: '#/components/schemas/Distribution'

		Distribution:
		type: object
		properties:
		couter:
		type: integer
		bin:
		type: string

		ExpectationVerb:
		type: string
		enum:
		@@ -357,6 +392,7 @@ components:
		- $ref: '#/components/schemas/UEGroup'
		- $ref: '#/components/schemas/Frequency'
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime'
		- $ref: '#/components/schemas/CivicArea'
		UEGroup:
		description: >-
		It describes the UE Group,
		@@ -372,6 +408,107 @@ components:
		maximum: 255
		sNssai:
		$ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai'
		uEType:
		description: It describes the information of a UE Type defined in TS 38.331
		type: string
		enum:
		- REDCAP_UE
		- EREDCAP_UE
		IntentHandlingScope:
		type: string
		enum:
		- RAN
		- CN
		NegotiationFunctionality:
		type: string
		enum:
		- FEASIBILITY_CHECK
		- EXPLORATION
		- FULFILMENT_WITH_NEGOTIATION
		CivicArea:
		description: >-
		It describes civic area, which is represented by civic address (e.g. streets, districts, seats, etc.) or
		location label (e.g. hotel name, school name).
		type: object
		properties:
		civicAddress:
		$ref: '#/components/schemas/CivicAddress'
		locationLabel:
		description: >-
		It describes a location label (e.g. hotel name, school name).
		type: string
		CivicAddress:
		description: Indicates a Civic address.
		type: object
		properties:
		country:
		type: string
		A1:
		type: string
		A2:
		type: string
		A3:
		type: string
		A4:
		type: string
		A5:
		type: string
		A6:
		type: string
		PRD:
		type: string
		POD:
		type: string
		STS:
		type: string
		HNO:
		type: string
		HNS:
		type: string
		LMK:
		type: string
		LOC:
		type: string
		NAM:
		type: string
		PC:
		type: string
		BLD:
		type: string
		UNIT:
		type: string
		FLR:
		type: string
		ROOM:
		type: string
		PLC:
		type: string
		PCN:
		type: string
		POBOX:
		type: string
		ADDCODE:
		type: string
		SEAT:
		type: string
		RD:
		type: string
		RDSEC:
		type: string
		RDBR:
		type: string
		RDSUBBR:
		type: string
		PRM:
		type: string
		POM:
		type: string
		usageRules:
		type: string
		method:
		type: string
		providedBy:
		type: string
		IntentHandlingInfo:
		description: >-
		It contains includeTraceInfo, which is an attribute to control whether traceability
		@@ -389,6 +526,7 @@ components:
		uniqueItems: true
		items:
		$ref: '#/components/schemas/IntentTraceabilityInfo'

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

		#-------Definition of the generic ExpectationTarget dataType----------#
		@@ -467,9 +605,8 @@ components:
		type: string
		observationPeriod:
		description: >-
		It indicates the time period for which the fulfilment process is observed
		and at the end of which the fulfilmentInfo for corresponding
		ExpectationTargets, IntentExpectations and Intent is updated.
		It indicates the time period for which the fulfilment process or exploration process is observed
		and at the end of which which the IntentFulfilmentReport or IntentExplorationReport is updated and reported.
		type: integer
		expectedReportTypes:
		description: >-
		@@ -572,6 +709,8 @@ components:
		readOnly: true
		expectationFulfilmentInfo:
		$ref: '#/components/schemas/FulfilmentInfo'
		expectationFulfilmentStatisticsInfo:
		$ref: '#/components/schemas/FulfilmentStatisticsInfo'
		targetFulfilmentResults:
		type: array
		uniqueItems: true
		@@ -693,6 +832,12 @@ components:
		type: array
		items:
		$ref: '#/components/schemas/InFeasibleExpectationInfo'
		additionalPreEvaluationInfo:
		description: >-
		It describes the additional provide additional pre-evaluation information for feasibility
		check process. The content and format is vendor specific.
		type: string
		readOnly: true
		required:
		- feasibilityCheckResult
		- infeasibilityReasons
		@@ -709,12 +854,23 @@ components:
		type: array
		uniqueItems: true
		items:
		type: string
		$ref: '#/components/schemas/InFeasibleTargetInfo'
		readOnly: true
		description: It describes the list of TargetNames for the InFeasibleTargets
		description: It describes the list of inFeasibleTargetInfo for the InFeasibleTargets
		required:
		- expectationId
		- inFeasibleTargets
		InFeasibleTargetInfo:
		description: >-
		It describes each infeasible target, including the targetName and recommendedValue for the InFeasibleTargets.
		type: object
		properties:
		targetName:
		type: string
		readOnly: true
		recommendedValue:
		type: number
		readOnly: true
		#-------Definition of the concrete IntentFeasibilityCheckReport dataType----------------#


		@@ -731,6 +887,21 @@ components:
		$ref: '#/components/schemas/ExpectationExplorationResult'
		uniqueItems: true
		minItems: 1
		additionalPreEvaluationInfo:
		description: >-
		It describes the additional provide additional pre-evaluation information for intent exploration
		process. The content and format is vendor specific.
		type: string
		readOnly: true
		expectationExplorationStatus:
		description: ->
		It describes the status of intent exploration process.
		type: string
		enum:
		- NOT_STARTED
		- RUNNING
		- FINISHED
		- FAILED
		ExpectationExplorationResult:
		description: >-
		It represents the expectation exploration result for a specific intent expectation
		@@ -742,7 +913,7 @@ components:
		targetExplorationResults:
		type: array
		items:
		$ref: '#/components/schemas/ExpectationTarget'
		$ref: '#/components/schemas/TargetExplorationResult'
		uniqueItems: true
		minItems: 1
		contextExplorationResults:
		@@ -754,6 +925,23 @@ components:
		required:
		- expectationId
		- targetExplorationResults
		TargetExplorationResult:
		type: object
		description: >-
		It represents exploration results (i.e. recommended best values) for the expectation targets.
		properties:
		targetName:
		type: string
		targetCondition:
		$ref: '#/components/schemas/Condition'
		targetValueRange:
		$ref: '#/components/schemas/ValueRangeType'
		cellContext:
		$ref: 'TS28312_IntentExpectations.yaml#/components/schemas/CellContext'
		coverageAreaPolygonContext:
		$ref: 'TS28312_IntentExpectations.yaml#/components/schemas/CoverageAreaPolygonContext'


		#-------Definition of the generic IntentExplorationReport dataType----------------#


		@@ -854,6 +1042,7 @@ components:
		type: string
		readOnly: true
		supportedExpectationObjectType:
		description: It describes the expectation object type which can be supported by a specific intent handling function of MnS producer.
		type: string
		enum:
		- RAN_SUBNETWORK
		@@ -861,13 +1050,24 @@ components:
		- 5GC_SUBNETWORK
		- RADIO_SERVICE
		readOnly: true
		description: It describes the expectation object type which can be supported by a specific intent handling function of MnS producer.
		supportedObjectContextInfoList:
		type: array
		items:
		$ref: '#/components/schemas/SupportedContextInfo'
		uniqueItems: true
		minItems: 1
		supportedExpectationTargetInfoList:
		type: array
		items:
		$ref: '#/components/schemas/SupportedExpectationTargetInfo'
		uniqueItems: true
		minItems: 1
		supportedExpectationContextInfoList:
		type: array
		items:
		$ref: '#/components/schemas/SupportedContextInfo'
		uniqueItems: true
		minItems: 1
		required:
		- intentHandlingCapabilityId
		- supportedExpectationObjectType
		@@ -892,6 +1092,23 @@ components:
		- $ref: '#/components/schemas/ValueRangeType'
		required:
		- supportedTargetName

		SupportedContextInfo:
		type: object
		properties:
		supportedContextAttribute:
		type: string
		supportedContextCondition:
		$ref: '#/components/schemas/Condition'
		supportedContextValueRange:
		oneOf:
		- type: array
		uniqueItems: true
		minItems: 1
		items:
		$ref: '#/components/schemas/ValueRangeType'
		- $ref: '#/components/schemas/ValueRangeType'

		#-------Definition of the concrete IntentHandlingCapability dataType----------------#


		@@ -994,6 +1211,22 @@ components:

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

		#-------Definition of the generic IntentInterpretationAssistanceInformation dataType----------------#
		IntentInterpretationAssistanceInfo:
		description: >-
		It represents the additional information needed for intent interpretation.
		type: object
		properties:
		dateTime:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
		conditions:
		type: string
		prevProducerMessage:
		type: string
		prevConsumerMessage:
		type: string
		#-------Definition of the concrete IntentInterpretationAssistanceInformation dataType----------------#

		#----- Definitions in TS 28.312 for TS 28.532 --------------------------#
		resources-intentNrm:
		oneOf:

OpenAPI/TS28561_NdtNrm.yaml

+40 −0

Original line number	Diff line number	Diff line
		@@ -60,6 +60,8 @@ components:
		$ref: '#/components/schemas/NDTInputDescription'
		nDTJobExecutionRequirements:
		$ref: '#/components/schemas/NdtJobExecutionReqts'
		ndtDataGeneration:
		$ref: '#/components/schemas/DataGeneration'
		collaboratingNDT:
		description: >-
		It indicates the related NDT Job contributing as a collaborator to the executed NDT Job. It describes the DN of the collaborated NDT Job
		@@ -82,6 +84,15 @@ components:
		items:
		$ref: '#/components/schemas/NDTOutputDataPoint'
		description: It indicates the list of NDTOutput(s) that are provided by the NDT function as the output for any task executed in an instantiated NDT job.
		nDTCollaborationInfoList:
		type: array
		items:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo'
		nDTDaenumtaGenEnaInfo:
		type: string
		enum:
		- AIML_BASED
		- NON_AIML_BASED
		nDTJobRef:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'

		@@ -208,6 +219,35 @@ components:
		performanceDataScalingFactor:
		type: integer
		maxItems: 1
		DataGeneration:
		type: object
		properties:
		nDTDataGenObject:
		type: array
		uniqueItems: true
		items:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
		dataGenType:
		type: array
		uniqueItems: true
		items:
		$ref: '#/components/schemas/SimulationData'
		dataGenTimeWindow:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow'
		dataGenQuantity:
		$ref: '#/components/schemas/DataGenQuantity'
		DataGenQuantity:
		type: object
		oneOf:
		- required: [ numberOfData ]
		- required: [ dataGenPeriod ]
		properties:
		numberOfData:
		type: integer
		dataGenPeriod:
		type: integer



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

OpenAPI/TS28623_GenericNrm.yaml

+0 −3

Original line number	Diff line number	Diff line
		@@ -647,9 +647,6 @@ components:
		- $ref: 'TS28623_ExternalDataMgmtNrm.yaml#/components/schemas/SubNetwork-ncO-ExternalDataMgmtNrm'
		- $ref: 'TS28561_NdtNrm.yaml#/components/schemas/SubNetwork-ncO-NDTNrm'
		- $ref: 'TS28567_CclNrm.yaml#/components/schemas/SubNetwork-ncO-CCLNrm'
		- $ref: 'TS28623_ExternalDataMgmtNrm.yaml#/components/schemas/SubNetwork-ncO-ExternalDataMgmtNrm'
		- $ref: 'TS28561_NdtNrm.yaml#/components/schemas/SubNetwork-ncO-NDTNrm'
		- $ref: 'TS28567_CclNrm.yaml#/components/schemas/SubNetwork-ncO-CCLNrm'

		ManagedElement-Single:
		allOf:

Admin message