Merge branch 'Rel19_CR0359_TS28.312_Correct_issues_for_stage3_YAML_files' into... (fd9b1333) · Commits · SA5 – Management & Orchestration and Charging / Management and Orchestration APIs

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

OpenAPI/TS28312_IntentNrm.yaml

+72 −41

Original line number	Diff line number	Diff line
		@@ -77,6 +77,9 @@ components:
		type: boolean
		intentReportControl:
		$ref: '#/components/schemas/IntentReportControl'
		implicitIntentIndex:
		type: boolean
		default: false
		intentReportReference:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'
		intentUtilityFormulaRef:
		@@ -120,21 +123,15 @@ components:
		minItems: 1
		items:
		$ref: '#/components/schemas/IntentHandlingCapability'
		supportedExpectationTargetInfo:
		supportedUtilityList:
		type: array
		items:
		$ref: '#/components/schemas/SupportedExpectationTargetInfo'
		$ref: '#/components/schemas/UtilityDefinition'
		uniqueItems: true
		minItems: 1
		Intent:
		$ref: '#/components/schemas/Intent-Multiple'
		IntentReport:
		$ref: '#/components/schemas/IntentReport-Multiple'
		supportedUtilityList:
		type: array
		items:
		$ref: '#/components/schemas/UtilityDefinition'
		uniqueItems: true
		IntentUtilityFormula-Single:
		description: >-
		It represents an intent utility function instance.
		@@ -144,8 +141,6 @@ components:
		properties:
		utilityFunctionId:
		type: string
		uniqueItems: true
		minItems: 1
		utilityParameterList:
		type: array
		items:
		@@ -155,9 +150,11 @@ components:
		utilityScale:
		type: number
		minItems: 1
		default: 0
		utilityOffset:
		type: number
		minItems: 1
		default: 0
		#-------Definition of generic IOCs ----------#

		#-------Definition of the generic IntentExpectation dataType ----------#
		@@ -194,6 +191,8 @@ components:
		description: It represents the preference information of the Consumer on expectations.
		required:
		- expectationId
		- expectationObject
		- expectationTargets
		#-------Definition of the generic IntentExpectation dataType ----------#

		#-------Definition of the generic ExpectationObject dataType ----------#
		@@ -427,6 +426,8 @@ components:
		- INTENT_FULFILMENT_REPORT
		- INTENT_CONFLICT_REPORT
		- INTENT_FEASIBILITY_CHECK_REPORT
		- INTENT_EXPLORATION_REPORT
		- INTENT_FULFILMENT_NEGOTIATION_REPORT
		- INTENT_UTILITY_REPORT
		reportingConditions:
		description: >-
		@@ -440,6 +441,9 @@ components:
		type: array
		items:
		type: string
		required:
		- reportRecipientAddress
		- observationPeriod
		ReportingCondition:
		description: >-
		It describes the specified conditions for intent reporting.
		@@ -502,6 +506,9 @@ components:
		uniqueItems: true
		items:
		$ref: '#/components/schemas/TargetFulfilmentResult'
		required:
		- expectaitonId
		- expectationFulfilmentInfo
		#-------Definition of the concrete ExpectationFulfilmentResult dataType----------------#

		#-------Definition of the generic TargetFulfilmentResult dataType----------------#
		@@ -525,6 +532,9 @@ components:
		uniqueItems: true
		items:
		$ref: '#/components/schemas/Context'
		required:
		- targetName
		- targetFulfilmentInfo
		#-------Definition of the concrete TargetFulfilmentResult dataType----------------#

		#-------Definition of the generic IntentConflictReport dataType----------------#
		@@ -564,7 +574,9 @@ components:
		enum:
		- MODIFY
		- DELETE

		required:
		- conflictId
		- conflictType
		#-------Definition of the concrete IntentConflictReport dataType----------------#


		@@ -607,6 +619,9 @@ components:
		type: array
		items:
		$ref: '#/components/schemas/InFeasibleExpectationInfo'
		required:
		- feasibilityCheckResult
		- infeasibilityReasons
		InFeasibleExpectationInfo:
		description: >-
		It describes the list of InFeasibleExpectationInfo for all infeasible IntentExpectations
		@@ -622,6 +637,9 @@ components:
		type: string
		readOnly: true
		description: It describes the list of TargetNames for the InFeasibleTargets
		required:
		- expectationId
		- inFeasibleTargets
		#-------Definition of the concrete IntentFeasibilityCheckReport dataType----------------#


		@@ -658,6 +676,9 @@ components:
		$ref: '#/components/schemas/Context'
		uniqueItems: true
		minItems: 1
		required:
		- expectationId
		- targetExplorationResults
		#-------Definition of the generic IntentExplorationReport dataType----------------#


		@@ -701,6 +722,9 @@ components:
		$ref: '#/components/schemas/PossibleImpact'
		uniqueItems: true
		minItems: 1
		required:
		- possibleIntentOutcomeId
		- intentFulfilmentInfo
		PossibleImpact:
		description: >-
		It represents the possible impact of the possible outcome
		@@ -769,6 +793,10 @@ components:
		$ref: '#/components/schemas/SupportedExpectationTargetInfo'
		uniqueItems: true
		minItems: 1
		required:
		- intentHandlingCapabilityId
		- supportedExpectationObjectType
		- supportedExpectationTargetInfoList
		SupportedExpectationTargetInfo:
		description: >-
		It indicates the detailed information about what the intent driven MnS producer supports for a given supportedExpectationObjectType.
		@@ -787,6 +815,8 @@ components:
		items:
		$ref: '#/components/schemas/ValueRangeType'
		- $ref: '#/components/schemas/ValueRangeType'
		required:
		- supportedTargetName
		#-------Definition of the concrete IntentHandlingCapability dataType----------------#


		@@ -810,8 +840,10 @@ components:
		properties:
		utilityFunctionId:
		type: string
		readOnly: true
		utilityResult:
		type: number
		readOnly: true
		#-------Definition of the concrete UtilityResult dataType----------------#

		#-------Definition of the generic UtilityDefinition dataType----------------#
		@@ -822,16 +854,15 @@ components:
		properties:
		utilityDefinitionId:
		type: string
		readOnly: true
		utilityDescription:
		type: string
		readOnly: true
		utilityParameterList:
		oneOf:
		- type: array
		uniqueItems: true
		minItems: 1
		type: array
		items:
		$ref: '#/components/schemas/UtilityParameter'
		- $ref: '#/components/schemas/UtilityParameter'
		uniqueItems: true
		#-------Definition of the concrete UtilityDefinition dataType----------------#

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