Update 2 files (f8a5e4d5) · Commits · SA5 – Management & Orchestration and Charging / Management and Orchestration APIs

OpenAPI/TS28312_IntentExpectations.yaml

+49 −49

Original line number	Diff line number	Diff line
		@@ -22,26 +22,26 @@ components:
		expectationId:
		type: string
		expectationVerb:
		$ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb"
		$ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb'
		expectationObjects:
		type: array
		items:
		$ref: "#/components/schemas/RadioNetworkExpectationObject"
		$ref: '#/components/schemas/RadioNetworkExpectationObject'
		expectationTargets:
		type: array
		items:
		type: object
		oneOf:
		- $ref: "#/components/schemas/WeakRSRPRatioTarget"
		- $ref: "#/components/schemas/LowSINRRatioTarget"
		- $ref: "#/components/schemas/AveULRANUEThptTarget"
		- $ref: "#/components/schemas/AveDLRANUEThptTarget"
		- $ref: "#/components/schemas/LowULRANUEThptRatioTarget"
		- $ref: "#/components/schemas/LowDLRANUEThptRatioTarget"
		- $ref: '#/components/schemas/WeakRSRPRatioTarget'
		- $ref: '#/components/schemas/LowSINRRatioTarget'
		- $ref: '#/components/schemas/AveULRANUEThptTarget'
		- $ref: '#/components/schemas/AveDLRANUEThptTarget'
		- $ref: '#/components/schemas/LowULRANUEThptRatioTarget'
		- $ref: '#/components/schemas/LowDLRANUEThptRatioTarget'
		expectationContexts:
		type: array
		items:
		$ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext"
		$ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext'
		required:
		- expectationId
		ServiceSupportExpectation:
		@@ -52,34 +52,34 @@ components:
		expectationId:
		type: string
		expectationVerb:
		$ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb"
		$ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb'
		expectationObjects:
		type: array
		items:
		$ref: "#/components/schemas/ServiceSupportExpectationObject"
		$ref: '#/components/schemas/ServiceSupportExpectationObject'
		expectationTargets:
		type: array
		items:
		type: object
		oneOf:
		- $ref: "#/components/schemas/DLThptPerUETarget"
		- $ref: "#/components/schemas/ULThptPerUETarget"
		- $ref: "#/components/schemas/DLLatencyTarget"
		- $ref: "#/components/schemas/ULLatencyTarget"
		- $ref: "#/components/schemas/MaxNumberofUEsTarget"
		- $ref: "#/components/schemas/ActivityFactorTarget"
		- $ref: "#/components/schemas/UESpeedTarget"
		- $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget"
		- $ref: '#/components/schemas/DLThptPerUETarget'
		- $ref: '#/components/schemas/ULThptPerUETarget'
		- $ref: '#/components/schemas/DLLatencyTarget'
		- $ref: '#/components/schemas/ULLatencyTarget'
		- $ref: '#/components/schemas/MaxNumberofUEsTarget'
		- $ref: '#/components/schemas/ActivityFactorTarget'
		- $ref: '#/components/schemas/UESpeedTarget'
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget'
		expectationContexts:
		type: array
		items:
		type: object
		oneOf:
		- $ref: "#/components/schemas/ServiceStartTimeContext"
		- $ref: "#/components/schemas/ServiceEndTimeContext"
		- $ref: "#/components/schemas/UEMobilityLevelContext"
		- $ref: "#/components/schemas/ResourceSharingLevelContext"
		- $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext"
		- $ref: '#/components/schemas/ServiceStartTimeContext'
		- $ref: '#/components/schemas/ServiceEndTimeContext'
		- $ref: '#/components/schemas/UEMobilityLevelContext'
		- $ref: '#/components/schemas/ResourceSharingLevelContext'
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext'
		required:
		- expectationId
		#-------Definition of the IntentExpectation dataType ----------#
		@@ -95,18 +95,18 @@ components:
		enum:
		- RAN_SubNetwork #value for Radio Network Expectation--#
		objectInstance:
		$ref: "TS28623_ComDefs.yaml#/components/schemas/Dn"
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
		objectContexts:
		type: array
		items:
		type: object
		oneOf:
		- $ref: "#/components/schemas/CoverageAreaPolygonContext"
		- $ref: "#/components/schemas/CoverageTACContext"
		- $ref: "#/components/schemas/PLMNContext"
		- $ref: "#/components/schemas/NRFqBandContext"
		- $ref: "#/components/schemas/RATContext"
		- $ref: "#/components/schemas/ObjectContext"
		- $ref: '#/components/schemas/CoverageAreaPolygonContext'
		- $ref: '#/components/schemas/CoverageTACContext'
		- $ref: '#/components/schemas/PLMNContext'
		- $ref: '#/components/schemas/NRFqBandContext'
		- $ref: '#/components/schemas/RATContext'
		- $ref: '#/components/schemas/ObjectContext'
		ServiceSupportExpectationObject:
		description: >-
		This data type is the "ExpectationObject" data type with specialisations for ServiceSupportExpectation
		@@ -117,16 +117,16 @@ components:
		enum:
		- Service_Support #value for Service Support Expectation--#
		objectInstance:
		$ref: "TS28623_ComDefs.yaml#/components/schemas/Dn"
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
		objectContexts:
		type: array
		items:
		type: object
		oneOf:
		- $ref: "#/components/schemas/EdgeIdenfiticationIdContext"
		- $ref: "#/components/schemas/EdgeIdenfiticationLocContext"
		- $ref: "#/components/schemas/CoverageAreaTAContext"
		- $ref: "#/components/schemas/ObjectContext"
		- $ref: '#/components/schemas/EdgeIdenfiticationIdContext'
		- $ref: '#/components/schemas/EdgeIdenfiticationLocContext'
		- $ref: '#/components/schemas/CoverageAreaTAContext'
		- $ref: '#/components/schemas/ObjectContext'
		#-------Definition of the ExpectationObject dataType ----------#


		@@ -149,7 +149,7 @@ components:
		minimum: 0
		maximum: 100
		targetContexts:
		$ref: "#/components/schemas/WeakRSRPContext"
		$ref: '#/components/schemas/WeakRSRPContext'
		WeakRSRPContext:
		description: >-
		This data type is the "TargetContext" data type with specialisations for WeakRSRPContext
		@@ -183,7 +183,7 @@ components:
		minimum: 0
		maximum: 100
		targetContexts:
		$ref: "#/components/schemas/LowSINRContext"
		$ref: '#/components/schemas/LowSINRContext'
		LowSINRContext:
		description: >-
		This data type is the "TargetContext" data type with specialisations for LowSINRContext
		@@ -247,7 +247,7 @@ components:
		minimum: 0
		maximum: 100
		targetContexts:
		$ref: "#/components/schemas/LowULRANUEThptContext"
		$ref: '#/components/schemas/LowULRANUEThptContext'
		LowULRANUEThptContext:
		description: >-
		This data type is the "TargetContext" data type with specialisations for LowULRANUEThptContext
		@@ -281,7 +281,7 @@ components:
		minimum: 0
		maximum: 100
		targetContexts:
		$ref: "#/components/schemas/LowDLRANUEThptContext"
		$ref: '#/components/schemas/LowDLRANUEThptContext'
		LowDLRANUEThptContext:
		description: >-
		This data type is the "TargetContext" data type with specialisations for LowDLRANUEThptContext
		@@ -311,7 +311,7 @@ components:
		enum:
		- IS_GREATER_THAN
		targetValueRange:
		$ref: "TS28541_SliceNrm.yaml#/components/schemas/XLThpt"
		$ref: 'TS28541_SliceNrm.yaml#/components/schemas/XLThpt'
		ULThptPerUETarget:
		description: >-
		This data type is the "ExpectationTarget" data type with specialisations for ULThptPerUETarget
		@@ -326,7 +326,7 @@ components:
		enum:
		- IS_GREATER_THAN
		targetValueRange:
		$ref: "TS28541_SliceNrm.yaml#/components/schemas/XLThpt"
		$ref: 'TS28541_SliceNrm.yaml#/components/schemas/XLThpt'
		DLLatencyTarget:
		description: >-
		This data type is the "ExpectationTarget" data type with specialisations for DLLatencyTarget
		@@ -413,7 +413,7 @@ components:
		contextAttribute:
		type: string
		contextCondition:
		$ref: "TS28312_IntentNrm.yaml#/components/schemas/Condition"
		$ref: 'TS28312_IntentNrm.yaml#/components/schemas/Condition'
		contextValueRange:
		type: array
		items:
		@@ -434,7 +434,7 @@ components:
		contextValueRange:
		type: array
		items:
		$ref: "#/components/schemas/CoverageArea"
		$ref: '#/components/schemas/CoverageArea'
		CoverageArea:
		type: string
		CoverageTACContext:
		@@ -453,7 +453,7 @@ components:
		contextValueRange:
		type: array
		items:
		$ref: "TS28541_NrNrm.yaml#/components/schemas/NrTac"
		$ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTac'
		PLMNContext:
		description: >-
		This data type is the "ObjectContext" data type with specialisations for PLMNContext
		@@ -470,7 +470,7 @@ components:
		contextValueRange:
		type: array
		items:
		$ref: "TS28623_ComDefs.yaml#/components/schemas/PlmnId"
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
		NRFqBandContext:
		description: >-
		This data type is the "ObjectContext" data type with specialisations for NRFqBandContext
		@@ -559,7 +559,7 @@ components:
		contextValueRange:
		type: array
		items:
		$ref: "#/components/schemas/CoverageAreaTAList"
		$ref: '#/components/schemas/CoverageAreaTAList'
		CoverageAreaTAList:
		type: integer
		#-------Definition of the scenario specific ObjectTarget dataType----------------#
		@@ -611,7 +611,7 @@ components:
		contextValueRange:
		type: array
		items:
		$ref: "TS28541_SliceNrm.yaml#/components/schemas/MobilityLevel"
		$ref: 'TS28541_SliceNrm.yaml#/components/schemas/MobilityLevel'
		ResourceSharingLevelContext:
		description: >-
		This data type is the "ExpectationContext" data type with specialisations for ResourceSharingLevelContext
		@@ -628,5 +628,5 @@ components:
		contextValueRange:
		type: array
		items:
		$ref: "TS28541_SliceNrm.yaml#/components/schemas/SharingLevel"
		$ref: 'TS28541_SliceNrm.yaml#/components/schemas/SharingLevel'
		#-------Definition of the concrete ExpectionContext dataType----------------#

OpenAPI/TS28312_IntentNrm.yaml

+29 −31

Original line number	Diff line number	Diff line
		@@ -42,17 +42,17 @@ components:
		items:
		type: object
		oneOf:
		- $ref: "#/components/schemas/IntentExpectation"
		- $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioNetworkExpectation"
		- $ref: "TS28312_IntentExpectations.yaml#/components/schemas/ServiceSupportExpectation"
		- $ref: '#/components/schemas/IntentExpectation'
		- $ref: 'TS28312_IntentExpectations.yaml#/components/schemas/RadioNetworkExpectation'
		- $ref: 'TS28312_IntentExpectations.yaml#/components/schemas/ServiceSupportExpectation'
		intentContexts:
		type: array
		items:
		$ref: "#/components/schemas/IntentContext"
		$ref: '#/components/schemas/IntentContext'
		observationPeriod:
		type: integer
		intentReportReference:
		$ref: "TS28623_ComDefs.yaml#/components/schemas/Dn"
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

		IntentReport-Single:
		allOf:
		@@ -62,17 +62,17 @@ components:
		intentFulfilmentReport:
		type: array
		items:
		$ref: "#/components/schemas/IntentFulfilmentReport"
		$ref: '#/components/schemas/IntentFulfilmentReport'
		intentConflictReports:
		type: array
		items:
		$ref: "#/components/schemas/IntentConflictReport"
		$ref: '#/components/schemas/IntentConflictReport'
		intentFeasibilityCheckReport:
		type: array
		items:
		$ref: "#/components/schemas/IntentFeasibilityCheckReport"
		$ref: '#/components/schemas/IntentFeasibilityCheckReport'
		intentReference:
		$ref: "TS28623_ComDefs.yaml#/components/schemas/Dn"
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

		IntentHandlingFunction-Single:
		allOf:
		@@ -82,7 +82,7 @@ components:
		intentHandlingCapabilityList:
		type: array
		items:
		$ref: "/components/schemas/IntentHandlingCapability"
		$ref: '#/components/schemas/IntentHandlingCapability'
		Intent:
		$ref: '#/components/schemas/Intent-Multiple'
		IntentReport:
		@@ -99,19 +99,19 @@ components:
		expectationId:
		type: string
		expectationVerb:
		$ref: "#/components/schemas/ExpectationVerb"
		$ref: '#/components/schemas/ExpectationVerb'
		expectationObjects:
		type: array
		items:
		$ref: "#/components/schemas/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"
		$ref: '#/components/schemas/ExpectationContext'
		required:
		- expectationId
		#-------Definition of the generic IntentExpectation dataType ----------#
		@@ -129,11 +129,11 @@ components:
		- Service_Support #value for Service Support Expectation--#
		- TBD #-This will be added based on defined scenario specfic intent 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 ----------#

		@@ -171,7 +171,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
		@@ -197,7 +197,7 @@ components:
		contextAttribute:
		type: string
		contextCondition:
		$ref: "#/components/schemas/Condition"
		$ref: '#/components/schemas/Condition'
		contextValueRange:
		type: array
		items:
		@@ -213,13 +213,13 @@ components:
		targetName:
		type: string
		targetCondition:
		$ref: "#/components/schemas/Condition"
		$ref: '#/components/schemas/Condition'
		targetValueRange:
		type: number
		targetContexts:
		type: array
		items:
		$ref: "#/components/schemas/TargetContext"
		$ref: '#/components/schemas/TargetContext'
		TargetContext:
		description: >-
		This data type is the "TargetContext" data type without specialisations
		@@ -228,7 +228,7 @@ components:
		contextAttribute:
		type: string
		contextCondition:
		$ref: "#/components/schemas/Condition"
		$ref: '#/components/schemas/Condition'
		contextValueRange:
		type: number
		#-------Definition of the generic ExpectationTarget dataType----------#
		@@ -242,7 +242,7 @@ components:
		contextAttribute:
		type: string
		contextCondition:
		$ref: "#/components/schemas/Condition"
		$ref: '#/components/schemas/Condition'
		contextValueRange:
		type: array
		items:
		@@ -258,7 +258,7 @@ components:
		contextAttribute:
		type: string
		contextCondition:
		$ref: "#/components/schemas/Condition"
		$ref: '#/components/schemas/Condition'
		contextValueRange:
		type: array
		items:
		@@ -271,11 +271,11 @@ components:
		type: object
		properties:
		intentFulfilmentInfo:
		$ref: "#/components/schemas/FulfilmentInfo"
		$ref: '#/components/schemas/FulfilmentInfo'
		expectationFulfilmentResult:
		type: array
		items:
		$ref: "#/components/schemas/ExpectationFulfilmentResult"
		$ref: '#/components/schemas/ExpectationFulfilmentResult'
		#-------Definition of the concrete IntentFulfilmentReport dataType----------------#

		#-------Definition of the generic ExpectationFulfilmentResult dataType----------------#
		@@ -287,11 +287,11 @@ components:
		expectaitonId:
		type: string
		expectationFulfilmentInfo:
		$ref: "#/components/schemas/FulfilmentInfo"
		$ref: '#/components/schemas/FulfilmentInfo'
		targetFulfilmentResult:
		type: array
		items:
		$ref: "#/components/schemas/TargetFulfilmentResult"
		$ref: '#/components/schemas/TargetFulfilmentResult'
		#-------Definition of the concrete ExpectationFulfilmentResult dataType----------------#

		#-------Definition of the generic TargetFulfilmentResult dataType----------------#
		@@ -303,7 +303,7 @@ components:
		targetName:
		type: string
		targetFulfilmentInfo:
		$ref: "#/components/schemas/FulfilmentInfo"
		$ref: '#/components/schemas/FulfilmentInfo'
		targetAchievedValue:
		type: number
		#-------Definition of the concrete TargetFulfilmentResult dataType----------------#
		@@ -343,8 +343,6 @@ components:

		#-------Definition of the generic IntentHandlingCapability dataType----------------#
		IntentHandlingCapability:
		description: >-
		This data type is the "IntentHandlingCapability" data type without specialisations
		type: object
		properties:
		intentHandlingCapabilityId: