Code Moderator resolves the implementation conflict (cd00213c) · Commits · SA5 – Management & Orchestration and Charging / Management and Orchestration APIs

OpenAPI/TS28104_MdaNrm.yaml

+3 −1

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ components:
		properties:
		areaScope:
		type: array
		uniqueItems: true
		items:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea'

		@@ -64,7 +65,7 @@ components:
		type: object
		properties:
		mDAType:
		type: string
		$ref: '#/components/schemas/MDAType'
		mDAOutputIEFilters:
		type: array
		uniqueItems: true
		@@ -80,6 +81,7 @@ components:
		type: string
		threshold:
		type: array
		uniqueItems: true
		items:
		$ref: '#/components/schemas/ThresholdInfo'
		analyticsPeriod:

OpenAPI/TS28104_MdaReport.yaml

+2 −2

Original line number	Diff line number	Diff line
		@@ -19,8 +19,7 @@ components:
		type: object
		properties:
		mDAType:
		type: string
		readOnly: true
		$ref: 'TS28104_MdaNrm.yaml#/components/schemas/MDAType'
		mDAOutputList:
		type: array
		uniqueItems: true
		@@ -56,6 +55,7 @@ components:
		type: string
		mDAOutputs:
		type: array
		uniqueItems: true
		items:
		$ref: '#/components/schemas/MDAOutputs'
		mDARequestRef:

OpenAPI/TS28312_IntentExpectations.yaml

+113 −2

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@ components:
		- $ref: '#/components/schemas/AveDLPrbLoadTarget'
		- $ref: "#/components/schemas/RANEnergyConsumptionTarget"
		- $ref: "#/components/schemas/RANEnergyEfficiencyTarget"
		- $ref: "#/components/schemas/ActiveUEsNumTarget"
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget'
		expectationContexts:
		type: array
		@@ -51,6 +52,7 @@ components:
		type: object
		oneOf:
		- $ref: '#/components/schemas/TargetAssuranceTimeContext'
		- $ref: '#/components/schemas/SchedulingTimeContext'
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context'
		required:
		- expectationId
		@@ -75,12 +77,16 @@ components:
		- $ref: '#/components/schemas/ULLatencyTarget'
		- $ref: '#/components/schemas/DLThptPerUETarget'
		- $ref: '#/components/schemas/ULThptPerUETarget'
		- $ref: '#/components/schemas/NumberofUEsTarget'
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget'
		expectationContexts:
		type: array
		uniqueItems: true
		items:
		$ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context'
		type: object
		oneOf:
		- $ref: '#/components/schemas/SchedulingTimeContext'
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context'
		required:
		- expectationId
		EdgeServiceSupportExpectation:
		@@ -179,6 +185,7 @@ components:
		oneOf:
		- $ref: '#/components/schemas/CoverageAreaPolygonContext'
		- $ref: '#/components/schemas/CoverageTACContext'
		- $ref: '#/components/schemas/CellContext'
		- $ref: '#/components/schemas/PLMNContext'
		- $ref: '#/components/schemas/DlFrequencyContext'
		- $ref: '#/components/schemas/UlFrequencyContext'
		@@ -204,6 +211,7 @@ components:
		oneOf:
		- $ref: '#/components/schemas/CoverageAreaPolygonContext'
		- $ref: '#/components/schemas/ServiceTypeContext'
		- $ref: '#/components/schemas/PlmnInfoContext'
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context'
		EdgeServiceSupportExpectationObject:
		description: >-
		@@ -347,6 +355,13 @@ components:
		- IS_GREATER_THAN
		targetValueRange:
		type: integer
		targetContexts:
		type: array
		items:
		type: object
		oneOf:
		- $ref: '#/components/schemas/UlFrequencyContext'
		- $ref: '#/components/schemas/RATContext'
		AveDLRANUEThptTarget:
		description: >-
		This data type is the "ExpectationTarget" data type with specialisations for AveDLRANUEThptTarget.It describes the average
		@@ -364,6 +379,13 @@ components:
		- IS_GREATER_THAN
		targetValueRange:
		type: integer
		targetContexts:
		type: array
		items:
		type: object
		oneOf:
		- $ref: '#/components/schemas/DlFrequencyContext'
		- $ref: '#/components/schemas/RATContext'
		LowULRANUEThptRatioTarget:
		description: >-
		This data type is the "ExpectationTarget" data type with specialisations for LowULRANUEThptRatioTarget.It describes the low
		@@ -594,6 +616,41 @@ components:
		- IS_GREATER_THAN
		targetValueRange:
		type: integer
		ActiveUEsNumTarget:
		description: >-
		This data type is the "ExpectationTarget" data type with specialisations for ActiveUEsNumTarget.
		It describes the number of Active UEs for the specified areas. This target is related to Mean
		number of Active UEs in the DL per cell and Mean number of Active UEs in the UL per cell defined
		in 3GPP TS 28.552 [6].
		type: object
		properties:
		targetName:
		type: string
		enum:
		- ActiveUEsNum
		targetCondition:
		type: string
		enum:
		- IS_WITHIN_RANGE
		targetValueRange:
		type: array
		description: >-
		a pair of integer values to represent minimum number of active UEs and maximum number of active UEs.
		items:
		type: integer
		minItems: 1
		maxItems: 2
		NumberofUEsTarget:
		description: >-
		This data type is the "ExpectationTarget" data type with specialisations for NumberofUEsTarget.It describes
		the number of UEs target for the Radio Service that the intent expectation is applied.
		- NumberofUEs
		targetCondition:
		type: string
		enum:
		- IS_LESS_THAN
		targetValueRange:
		type: integer
		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
		@@ -828,6 +885,30 @@ components:
		uniqueItems: true
		items:
		$ref: "TS28623_ComDefs.yaml#/components/schemas/Tac"
		CellContext:
		description: >-
		This data type is the "ObjectContext" data type with specialisations for CellContext.
		It describes the coverage areas for the RAN SubNetwork that the intent expectation is applied
		in the form of a list of cells (including E-UTRAN cells identified by E-UTRAN-CGI and NR cells
		identified by NG-RAN CGI).
		type: object
		properties:
		contextAttribute:
		type: string
		enum:
		- Cell
		contextCondition:
		type: string
		enum:
		- IS_ALL_OF
		contextValueRange:
		type: array
		items:
		$ref: "#/components/schemas/CellId"
		CellId:
		oneOf:
		- $ref: 'TS28623_ComDefs.yaml#/components/schemas/EutraCellId'
		- $ref: 'TS28623_ComDefs.yaml#/components/schemas/NrCellId'
		PLMNContext:
		description: >-
		This data type is the "ObjectContext" data type with specialisations for PLMNContext
		@@ -1160,6 +1241,36 @@ components:
		- IS_EQUAL_TO
		contextValueRange:
		$ref: "TS28541_NrNrm.yaml#/components/schemas/Sst"
		PlmnInfoContext:
		description: >-
		This data type is the "ExpectationContext" data type with specialisations for PlmnInfoContext.It describes the PLMN supported by the Radio Service that the intent expectation is applied. In case of network slicing feature is supported, this also represents the S-NSSAI in the PLMN supported by the Radio Service.
		type: object
		properties:
		contextAttribute:
		type: string
		enum:
		- PlmnInfo
		contextCondition:
		type: string
		enum:
		- IS_ALL_OF
		contextValueRange:
		$ref: "TS28541_NrNrm.yaml#/components/schemas/PlmnInfo"
		SchedulingTimeContext:
		description: >-
		This data type is the "ExpectationContext" data type with specialisations for SchedulingTimeContext.It describes the scheduled times (including one-time interval, daily periodicity, weekly periodicity or monthly periodicity) for the IntentObject that the intent expectation is applied.
		type: object
		properties:
		contextAttribute:
		type: string
		enum:
		- schedulingTime
		contextCondition:
		type: string
		enum:
		- IS_ALL_OF
		contextValueRange:
		$ref: "TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime"
		StartTimeContext:
		description: >-
		This data type is the "ExpectationContext" data type with specialisations for StartTimeContext

OpenAPI/TS28312_IntentNrm.yaml

+178 −13

Original line number	Diff line number	Diff line
		@@ -43,8 +43,12 @@ components:
		- $ref: "TS28312_IntentExpectations.yaml#/components/schemas/EdgeServiceSupportExpectation"
		- $ref: "TS28312_IntentExpectations.yaml#/components/schemas/5GCNetworkExpectation"
		- $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioServiceExpectation"
		intentMgmtPurpose:
		$ref: "#/components/schemas/IntentMgmtPurpose"
		contextSelectivity:
		$ref: "#/components/schemas/Selectivity"
		expectationSelectivity:
		$ref: "#/components/schemas/Selectivity"
		intentContexts:
		type: array
		uniqueItems: true
		@@ -68,11 +72,8 @@ components:
		description: It expresses the priority of the stated intent within a MnS consumer.
		intentPreemptionCapability:
		type: boolean
		observationPeriod:
		type: integer
		description: >-
		It represents the observation period of the fulfilmentInfo for corresponding
		ExpectationTargets, IntentExpectations and Intent.
		intentReportControl:
		$ref: '#/components/schemas/IntentReportControl'
		intentReportReference:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'
		IntentReport-Single:
		@@ -90,6 +91,8 @@ components:
		$ref: '#/components/schemas/IntentConflictReport'
		intentFeasibilityCheckReport:
		$ref: '#/components/schemas/IntentFeasibilityCheckReport'
		intentExplorationReport:
		$ref: '#/components/schemas/IntentExplorationReport'
		lastUpdatedTime:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo'
		intentReference:
		@@ -108,6 +111,12 @@ components:
		minItems: 1
		items:
		$ref: '#/components/schemas/IntentHandlingCapability'
		supportedExpectationTargetInfo:
		type: array
		items:
		$ref: '#/components/schemas/SupportedExpectationTargetInfo'
		uniqueItems: true
		minItems: 1
		Intent:
		$ref: '#/components/schemas/Intent-Multiple'
		IntentReport:
		@@ -192,6 +201,16 @@ components:
		- ALL_OF
		- ONE_OF
		- ANY_OF
		IntentMgmtPurpose:
		description: >-
		It describes the MnS consumer requirements for the management purpose (required procedures)
		of the created or modified intent instance
		type: string
		enum:
		- FEASIBILITYCHECK
		- FULFILMENT
		- EXPLORATION
		default: FULFILMENT
		FulfilmentStatus:
		type: string
		readOnly: true
		@@ -267,6 +286,8 @@ components:
		- $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate'
		- $ref: '#/components/schemas/UEGroup'
		- $ref: '#/components/schemas/Frequency'
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime'
		- $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfo'
		UEGroup:
		description: >-
		It describes the UE Group, which is
		@@ -331,6 +352,69 @@ components:
		- $ref: "#/components/schemas/ValueRangeType"
		#-------Definition of the generic Context dataType----------------#

		#-------Definition of the generic IntentReportControl dataType----------------#
		IntentReportControl:
		description: >-
		It describes intent report subscription information
		type: object
		properties:
		reportRecipientAddress:
		description: >-
		It indicates the address of report recipient for MnS consumer
		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.
		type: integer
		expectedReportTypes:
		description: >-
		It indicates the type of IntentReports.
		type: string
		enum:
		- INTENT_FULFILMENT_REPORT
		- INTENT_CONFLICT_REPORT
		- INTENT_FEASIBILITY_CHECK_REPORT
		reportingConditions:
		description: >-
		It indicates the specified conditions for intent reporting.
		type: array
		items:
		$ref: '#/components/schemas/ReportingCondition'
		reportingTargets:
		description: >-
		It indicates the specified targets needed to be reported.
		type: array
		items:
		type: string
		ReportingCondition:
		description: >-
		It describes the specified conditions for intent reporting.
		oneOf:
		- $ref: '#/components/schemas/TimeCondition'
		- $ref: '#/components/schemas/TargetFulfilmentCondition'
		TimeCondition:
		$ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime'
		TargetFulfilmentCondition:
		description: >-
		It indicates the specified conditions of target fulfilment for intent reporting.
		type: object
		properties:
		targetName:
		type: string
		targetCondition:
		$ref: '#/components/schemas/Condition'
		targetValueRange:
		oneOf:
		- type: array
		uniqueItems: true
		items:
		$ref: "#/components/schemas/ValueRangeType"
		- $ref: "#/components/schemas/ValueRangeType"
		#-------Definition of the concrete IntentReportControl dataType----------------#


		#-------Definition of the generic IntentFulfilmentReport dataType----------------#
		IntentFulfilmentReport:
		description: >-
		@@ -346,6 +430,8 @@ components:
		minItems: 1
		items:
		$ref: '#/components/schemas/ExpectationFulfilmentResult'
		additionalFulfilmentInfo:
		type: string
		#-------Definition of the concrete IntentFulfilmentReport dataType----------------#

		#-------Definition of the generic ExpectationFulfilmentResult dataType----------------#
		@@ -383,6 +469,11 @@ components:
		It describes the value that has been achieved for the expectation target at the time at which
		the report is generated.
		readOnly: true
		targetContexts:
		type: array
		uniqueItems: true
		items:
		$ref: '#/components/schemas/Context'
		#-------Definition of the concrete TargetFulfilmentResult dataType----------------#

		#-------Definition of the generic IntentConflictReport dataType----------------#
		@@ -447,8 +538,64 @@ components:
		enum:
		- INVALID_INTENT_EXPRESSION
		- INTENT_CONFLICT
		inFeasibleExpectationInfos:
		type: array
		items:
		$ref: '#/components/schemas/InFeasibleExpectationInfo'
		InFeasibleExpectationInfo:
		description: >-
		It describes the list of InFeasibleExpectationInfo for all infeasible IntentExpectations
		in the intent
		type: object
		properties:
		expectationId:
		type: string
		readOnly: true
		inFeasibleTargets:
		type: array
		items:
		type: string
		readOnly: true
		description: It describes the list of TargetNames for the InFeasibleTargets
		#-------Definition of the concrete IntentFeasibilityCheckReport dataType----------------#


		#-------Definition of the generic IntentExplorationReport dataType----------------#
		IntentExplorationReport:
		description: >-
		It represents the intent exploration information
		This attribute shall be supported when intent exploration information is supported by IntentReport
		type: object
		properties:
		expectationExplorationResults:
		type: array
		items:
		$ref: '#/components/schemas/ExpectationExplorationResult'
		uniqueItems: true
		minItems: 1
		ExpectationExplorationResult:
		description: >-
		It represents the expectation exploration result for a specific intent expectation
		type: object
		properties:
		expectationId:
		type: string
		readOnly: true
		targetExplorationResults:
		type: array
		items:
		$ref: '#/components/schemas/ExpectationTarget'
		uniqueItems: true
		minItems: 1
		contextExplorationResults:
		type: array
		items:
		$ref: '#/components/schemas/Context'
		uniqueItems: true
		minItems: 1
		#-------Definition of the generic IntentExplorationReport dataType----------------#


		#-------Definition of the generic IntentHandlingCapability dataType----------------#
		IntentHandlingCapability:
		description: >-
		@@ -476,6 +623,24 @@ components:
		type: string
		readOnly: true
		description: It describes the supported expectation targets for the supported expectation object type.
		SupportedExpectationTargetInfo:
		description: >-
		It indicates the detailed information about what the intent driven MnS producer supports for a given supportedExpectationObjectType.
		type: object
		properties:
		supportedExpectationTargetName:
		type: string
		readOnly: true
		supportedTargetCondition:
		$ref: '#/components/schemas/Condition'
		supportedTargetValueRange:
		oneOf:
		- type: array
		uniqueItems: true
		minItems: 1
		items:
		$ref: '#/components/schemas/ValueRangeType'
		- $ref: '#/components/schemas/ValueRangeType'
		#-------Definition of the concrete IntentHandlingCapability dataType----------------#

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

OpenAPI/TS28532_ProvMnS.yaml

+6 −29

Original line number	Diff line number	Diff line
		@@ -203,13 +203,12 @@ paths:
		in: query
		description: >-
		This parameter extends the set of targeted resources beyond the base
		resource identified with the path component of the URI. No scoping
		mechanism is specified in the present document.
		resource identified with the path component of the URI.
		required: false
		content:
		application/json:
		schema:
		$ref: '#/components/schemas/Scope'
		style: form
		explode: true
		- name: filter
		in: query
		description: >-
		@@ -402,7 +401,6 @@ components:
		- copy
		- move
		- test

		Resource:
		oneOf:
		- type: object
		@@ -421,28 +419,7 @@ components:
		type: object
		required:
		- id
		- anyOf:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/resources-genericNrm'
		- $ref: 'TS28541_NrNrm.yaml#/components/schemas/resources-nrNrm'
		- $ref: 'TS28541_5GcNrm.yaml#/components/schemas/resources-5gcNrm'
		- $ref: 'TS28541_SliceNrm.yaml#/components/schemas/resources-sliceNrm'
		- $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/resources-coslaNrm'
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/resources-intentNrm'
		- $ref: 'TS28104_MdaNrm.yaml#/components/schemas/resources-mdaNrm'
		- $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/resources-AiMlNrm'
		- $ref: 'TS28538_EdgeNrm.yaml#/components/schemas/resources-edgeNrm'
		- $ref: 'TS28317_RanScNrm.yaml#/components/schemas/resources-RanScNrm'
		- $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/resources-fileMgmtNrm'
		- $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/resources-mgmtDataCollectionNrm'
		- $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/resources-mnSRegistryNrm'
		- $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/resources-pmControlNrm'
		- $ref: 'TS28111_FaultNrm.yaml#/components/schemas/resources-faultNrm'
		- $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/resources-qoEMeasuremetCollectionNrm'
		- $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/resources-subscriptionControlNrm'
		- $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/resources-thresholdMonitorNrm'
		- $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/resources-traceControlNrm'
		- $ref: 'TS28319_MsacNrm.yaml#/components/schemas/resources-msacNrm'
		- $ref: 'TS28318_DsoNrm.yaml#/components/schemas/resources-DSORecovery'
		- $ref: 'TS28623_FeatureNrm.yaml#/components/schemas/resources-feature'
		Scope:
		type: object
		properties: