Merge branch 'Integration_Rel17_SA5_146_YAML' into 'Rel-17' (19d76f3c) · Commits · Miguel Angel Reina Ortega / Management and Orchestration APIs

OpenAPI/TS28104_MdaNrm.yaml

+38 −29

Original line number	Diff line number	Diff line
		openapi: 3.0.1
		info:
		title: MDA NRM
		version: 17.0.0
		version: 17.2.0
		description: >-
		OAS 3.0.1 specification of the MDA NRM
		© 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
		@@ -43,11 +43,9 @@ components:
		filterValue:
		type: string
		threshold:
		$ref: 'TS28623_GenericNrm.yaml#/components/schemas/ThresholdInfo'
		$ref: '#/components/schemas/ThresholdInfo'
		analyticsPeriod:
		type: array
		items:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
		$ref: '#/components/schemas/AnalyticsSchedule'
		timeOut:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'

		@@ -61,7 +59,7 @@ components:
		ReportingTarget:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'

		AnalyticsScope:
		AnalyticsScopeType:
		oneOf:
		- type: object
		properties:
		@@ -70,32 +68,43 @@ components:
		- type: object
		properties:
		areaScope:
		$ref: '#/components/schemas/GeoAreaList'

		GeoAreaList:
		type: array
		items:
		$ref: '#/components/schemas/GeoArea'
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea'

		GeoArea:
		type: object
		AnalyticsSchedule:
		oneOf:
		- type: object
		properties:
		coordinates:
		timeDurations:
		type: array
		items:
		$ref: '#/components/schemas/Coordinate'
		altitude:
		type: number
		format: float
		$ref: 'TS28104_MdaReport.yaml#/components/schemas/TimeWindow'
		- type: object
		properties:
		granularityPeriod:
		type: integer

		Coordinate:
		ThresholdInfo:
		type: object
		properties:
		latitude:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/Latitude'
		longitude:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/Longitude'

		monitoredMDAOutputIE:
		type: string
		thresholdDirection:
		type: string
		enum:
		- UP
		- DOWN
		- UP_AND_DOWN
		thresholdValue:
		oneOf:
		- type: integer
		- $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float'
		hysteresis:
		oneOf:
		- type: integer
		minimum: 0
		- type: number
		format: float
		minimum: 0

		#-------- Definition of abstract IOCs --------------------------------------------

		@@ -170,7 +179,7 @@ components:
		reportingTarget:
		$ref: '#/components/schemas/ReportingTarget'
		analyticsScope:
		$ref: '#/components/schemas/AnalyticsScope'
		$ref: '#/components/schemas/AnalyticsScopeType'
		startTime:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
		stopTime:

OpenAPI/TS28104_MdaReport.yaml

+3 −3

Original line number	Diff line number	Diff line
		openapi: 3.0.1
		info:
		title: MDA Report
		version: 17.0.0
		version: 17.2.0
		description: >-
		OAS 3.0.1 specification of the MDA Report
		© 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
		@@ -43,9 +43,9 @@ components:
		TimeWindow:
		type: object
		properties:
		startTime:
		mDAOutputStartTime:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
		endTime:
		mDAOutputEndTime:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'

OpenAPI/TS28105_AiMlNrm.yaml

+43 −43

Original line number	Diff line number	Diff line
		openapi: 3.0.1
		info:
		title: AI/ML NRM
		version: 17.0.0
		version: 17.2.0
		description: >-
		OAS 3.0.1 specification of the AI/ML NRM
		© 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
		@@ -15,28 +15,28 @@ components:

		#-------- Definition of types-----------------------------------------------------

		AIMLEntityList:
		MLEntityList:
		type: array
		items:
		$ref: '#/components/schemas/AIMLEntity'
		$ref: '#/components/schemas/MLEntity'

		AIMLEntity:
		MLEntity:
		type: object
		properties:
		aIMLEntityId:
		mLEntityId:
		type: string
		inferenceType:
		type: string
		aIMLEntityVersion:
		mLEntityVersion:
		type: string
		expectedRunTimeContext:
		$ref: '#/components/schemas/AIMLContext'
		$ref: '#/components/schemas/MLContext'
		trainingContext:
		$ref: '#/components/schemas/AIMLContext'
		$ref: '#/components/schemas/MLContext'
		runTimeContext:
		$ref: '#/components/schemas/AIMLContext'
		$ref: '#/components/schemas/MLContext'

		AIMLContext:
		MLContext:
		type: object
		properties:
		inferenceEntityRef:
		@@ -74,10 +74,10 @@ components:

		TrainingProcessMonitor:
		description: >-
		This data type is the "ProcessMonitor" data type defined in “genericNrm.yaml” with specialisations for usage in the "AIMLTrainingProcess".
		This data type is the "ProcessMonitor" data type defined in “genericNrm.yaml” with specialisations for usage in the "MLTrainingProcess".
		type: object
		properties:
		aIMLTrainingProcessId:
		mLTrainingProcessId:
		type: string
		status:
		type: string
		@@ -120,8 +120,8 @@ components:
		$ref: '#/components/schemas/SubNetwork-Multiple'
		ManagedElement:
		$ref: '#/components/schemas/ManagedElement-Multiple'
		AIMLTrainingFunction:
		$ref: '#/components/schemas/AIMLTrainingFunction-Multiple'
		MLTrainingFunction:
		$ref: '#/components/schemas/MLTrainingFunction-Multiple'

		ManagedElement-Single:
		allOf:
		@@ -133,10 +133,10 @@ components:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-ncO'
		- type: object
		properties:
		AIMLTrainingFunction:
		$ref: '#/components/schemas/AIMLTrainingFunction-Multiple'
		MLTrainingFunction:
		$ref: '#/components/schemas/MLTrainingFunction-Multiple'

		AIMLTrainingFunction-Single:
		MLTrainingFunction-Single:
		allOf:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
		- type: object
		@@ -146,19 +146,19 @@ components:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr'
		- type: object
		properties:
		aIMLEntityList:
		$ref: '#/components/schemas/AIMLEntityList'
		mLEntityList:
		$ref: '#/components/schemas/MLEntityList'
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
		- type: object
		properties:
		AIMLTrainingRequest:
		$ref: '#/components/schemas/AIMLTrainingRequest-Multiple'
		AIMLTrainingProcess:
		$ref: '#/components/schemas/AIMLTrainingProcess-Multiple'
		AIMLTrainingReport:
		$ref: '#/components/schemas/AIMLTrainingReport-Multiple'
		MLTrainingRequest:
		$ref: '#/components/schemas/MLTrainingRequest-Multiple'
		MLTrainingProcess:
		$ref: '#/components/schemas/MLTrainingProcess-Multiple'
		MLTrainingReport:
		$ref: '#/components/schemas/MLTrainingReport-Multiple'

		AIMLTrainingRequest-Single:
		MLTrainingRequest-Single:
		allOf:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
		- type: object
		@@ -167,7 +167,7 @@ components:
		allOf:
		- type: object
		properties:
		aIMLEntityId:
		mLEntityId:
		type: string
		candidateTraingDataSource:
		type: array
		@@ -189,7 +189,7 @@ components:
		suspendRequest:
		type: boolean

		AIMLTrainingProcess-Single:
		MLTrainingProcess-Single:
		allOf:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
		- type: object
		@@ -198,7 +198,7 @@ components:
		allOf:
		- type: object
		properties:
		aIMLTrainingProcessId:
		mLTrainingProcessId:
		type: string
		priority:
		type: integer
		@@ -216,7 +216,7 @@ components:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'


		AIMLTrainingReport-Single:
		MLTrainingReport-Single:
		allOf:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
		- type: object
		@@ -225,7 +225,7 @@ components:
		allOf:
		- type: object
		properties:
		aIMLEntityId:
		mLEntityId:
		type: string
		areConsumerTrainingDataUsed:
		type: boolean
		@@ -253,22 +253,22 @@ components:
		type: array
		items:
		$ref: '#/components/schemas/ManagedElement-Single'
		AIMLTrainingFunction-Multiple:
		MLTrainingFunction-Multiple:
		type: array
		items:
		$ref: '#/components/schemas/AIMLTrainingFunction-Single'
		AIMLTrainingRequest-Multiple:
		$ref: '#/components/schemas/MLTrainingFunction-Single'
		MLTrainingRequest-Multiple:
		type: array
		items:
		$ref: '#/components/schemas/AIMLTrainingRequest-Single'
		AIMLTrainingProcess-Multiple:
		$ref: '#/components/schemas/MLTrainingRequest-Single'
		MLTrainingProcess-Multiple:
		type: array
		items:
		$ref: '#/components/schemas/AIMLTrainingProcess-Single'
		AIMLTrainingReport-Multiple:
		$ref: '#/components/schemas/MLTrainingProcess-Single'
		MLTrainingReport-Multiple:
		type: array
		items:
		$ref: '#/components/schemas/AIMLTrainingReport-Single'
		$ref: '#/components/schemas/MLTrainingReport-Single'


		#-------- Definitions in TS 28.104 for TS 28.532 ---------------------------------
		@@ -278,7 +278,7 @@ components:
		- $ref: '#/components/schemas/SubNetwork-Single'
		- $ref: '#/components/schemas/ManagedElement-Single'

		- $ref: '#/components/schemas/AIMLTrainingFunction-Single'
		- $ref: '#/components/schemas/AIMLTrainingRequest-Single'
		- $ref: '#/components/schemas/AIMLTrainingProcess-Single'
		- $ref: '#/components/schemas/AIMLTrainingReport-Single'
		- $ref: '#/components/schemas/MLTrainingFunction-Single'
		- $ref: '#/components/schemas/MLTrainingRequest-Single'
		- $ref: '#/components/schemas/MLTrainingProcess-Single'
		- $ref: '#/components/schemas/MLTrainingReport-Single'

OpenAPI/TS28312_IntentNrm.yaml

+61 −35

Original line number	Diff line number	Diff line
		openapi: 3.0.1
		info:
		title: Intent NRM
		version: 17.0.0
		version: 17.1.0
		description: >-
		OAS 3.0.1 definition of the Intent NRM
		© 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
		@@ -12,6 +12,24 @@ externalDocs:
		paths: {}
		components:
		schemas:

		#-------Definition of concrete IOCs ----------#

		SubNetwork-Single:
		allOf:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
		- type: object
		properties:
		attributes:
		$ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr'
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO'
		- type: object
		properties:
		SubNetwork:
		$ref: '#/components/schemas/SubNetwork-Multiple'
		Intent:
		$ref: '#/components/schemas/Intent-Multiple'

		Intent-Single:
		allOf:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
		@@ -33,6 +51,7 @@ components:
		$ref: "#/components/schemas/IntentContext"
		intentFulfilmentInfo:
		$ref: "#/components/schemas/FulfilmentInfo"
		#-------Definition of concrete IOCs ----------#

		#-------Definition of the IntentExpectation dataType ----------#
		IntentExpectation:
		@@ -138,7 +157,7 @@ components:
		objectType:
		type: string
		enum:
		- RAN_SubNetwrok #value for Radio Network Expectation--#
		- RAN_SubNetwork #value for Radio Network Expectation--#
		- Service_Support #value for Service Support Expectation--#
		- TBD #-This will be added based on defined scenario specfic intent expectation-#
		objectInstance:
		@@ -155,7 +174,7 @@ components:
		objectType:
		type: string
		enum:
		- RAN_SubNetwrok #value for Radio Network Expectation--#
		- RAN_SubNetwork #value for Radio Network Expectation--#
		objectInstance:
		$ref: "TS28623_ComDefs.yaml#/components/schemas/Dn"
		objectContexts:
		@@ -195,10 +214,11 @@ components:
		Condition:
		type: string
		enum:
		- Is_equal_to
		- Is_less_than
		- Is_greater_than
		- Is_within_the_range
		- IS_EQUAL_TO
		- IS_LESS_THAN
		- IS_GREATER_THAN
		- IS_WITHIN_RANGE
		- IS_OUTSIDE_RANGE
		FulfilStatus:
		type: string
		enum:
		@@ -288,7 +308,7 @@ components:
		targetCondition:
		type: string
		enum:
		- Is_less_than
		- IS_LESS_THAN
		targetValueRange:
		type: integer
		minimum: 0
		@@ -309,7 +329,7 @@ components:
		contextCondition:
		type: string
		enum:
		- Is_less_than
		- IS_LESS_THAN
		contextValueRange:
		type: number
		LowSINRRatioTarget:
		@@ -324,7 +344,7 @@ components:
		targetCondition:
		type: string
		enum:
		- Is_less_than
		- IS_LESS_THAN
		targetValueRange:
		type: integer
		minimum: 0
		@@ -345,7 +365,7 @@ components:
		contextCondition:
		type: string
		enum:
		- Is_less_than
		- IS_LESS_THAN
		contextValueRange:
		type: integer
		AveULRANUEThptTarget:
		@@ -360,7 +380,7 @@ components:
		targetCondition:
		type: string
		enum:
		- Is_greater_than
		- IS_GREATER_THAN
		targetValueRange:
		type: integer
		targetFulfilmentInfo:
		@@ -377,7 +397,7 @@ components:
		targetCondition:
		type: string
		enum:
		- Is_greater_than
		- IS_GREATER_THAN
		targetValueRange:
		type: integer
		targetFulfilmentInfo:
		@@ -394,7 +414,7 @@ components:
		targetCondition:
		type: string
		enum:
		- Is_less_than
		- IS_LESS_THAN
		targetValueRange:
		type: integer
		minimum: 0
		@@ -430,7 +450,7 @@ components:
		targetCondition:
		type: string
		enum:
		- Is_less_than
		- IS_LESS_THAN
		targetValueRange:
		type: integer
		minimum: 0
		@@ -451,7 +471,7 @@ components:
		contextCondition:
		type: string
		enum:
		- Is_less_than
		- IS_LESS_THAN
		contextValueRange:
		type: number
		DLThptPerUETarget:
		@@ -466,7 +486,7 @@ components:
		targetCondition:
		type: string
		enum:
		- Is_greater_than
		- IS_GREATER_THAN
		targetValueRange:
		$ref: "TS28541_SliceNrm.yaml#/components/schemas/XLThpt"
		ULThptPerUETarget:
		@@ -481,7 +501,7 @@ components:
		targetCondition:
		type: string
		enum:
		- Is_greater_than
		- IS_GREATER_THAN
		targetValueRange:
		$ref: "TS28541_SliceNrm.yaml#/components/schemas/XLThpt"
		DLLatencyTarget:
		@@ -496,7 +516,7 @@ components:
		targetCondition:
		type: string
		enum:
		- Is_less_than
		- IS_LESS_THAN
		targetValueRange:
		type: integer
		ULLatencyTarget:
		@@ -511,7 +531,7 @@ components:
		targetCondition:
		type: string
		enum:
		- Is_less_than
		- IS_LESS_THAN
		targetValueRange:
		type: integer
		MaxNumberofUEsTarget:
		@@ -526,7 +546,7 @@ components:
		targetCondition:
		type: string
		enum:
		- Is_less _than
		- IS_LESS_THAN
		targetValueRange:
		type: integer
		ActivityFactorTarget:
		@@ -541,7 +561,7 @@ components:
		targetCondition:
		type: string
		enum:
		- Is_equal _than
		- IS_EQUAL_TO
		targetValueRange:
		type: integer
		UESpeedTarget:
		@@ -556,7 +576,7 @@ components:
		targetCondition:
		type: string
		enum:
		- Is_less _than
		- IS_LESS_THAN
		targetValueRange:
		type: integer
		#-------Definition of the concrete ExpectationTarget dataType----------#
		@@ -587,7 +607,7 @@ components:
		contextCondition:
		type: string
		enum:
		- Is_within_the_range
		- IS_WITHIN_RANGE
		contextValueRange:
		type: array
		items:
		@@ -606,7 +626,7 @@ components:
		contextCondition:
		type: string
		enum:
		- Is_within_the_range
		- IS_WITHIN_RANGE
		contextValueRange:
		type: array
		items:
		@@ -623,7 +643,7 @@ components:
		contextCondition:
		type: string
		enum:
		- Is_within_the_range
		- IS_WITHIN_RANGE
		contextValueRange:
		type: array
		items:
		@@ -640,7 +660,7 @@ components:
		contextCondition:
		type: string
		enum:
		- Is_within_the_range
		- IS_WITHIN_RANGE
		contextValueRange:
		type: array
		items:
		@@ -657,7 +677,7 @@ components:
		contextCondition:
		type: string
		enum:
		- Is_within_the_range
		- IS_WITHIN_RANGE
		contextValueRange:
		type: array
		items:
		@@ -678,7 +698,7 @@ components:
		contextCondition:
		type: string
		enum:
		- Is_equal_than
		- IS_EQUAL_TO
		contextValueRange:
		type: array
		items:
		@@ -695,7 +715,7 @@ components:
		contextCondition:
		type: string
		enum:
		- Is_equal_than
		- IS_EQUAL_TO
		contextValueRange:
		type: array
		items:
		@@ -712,7 +732,7 @@ components:
		contextCondition:
		type: string
		enum:
		- Is_within_the_range
		- IS_WITHIN_RANGE
		contextValueRange:
		type: array
		items:
		@@ -747,7 +767,7 @@ components:
		contextCondition:
		type: string
		enum:
		- Is_equal_than
		- IS_EQUAL_TO
		contextValueRange:
		type: string
		ServiceEndTimeContext:
		@@ -762,7 +782,7 @@ components:
		contextCondition:
		type: string
		enum:
		- Is_equal_than
		- IS_EQUAL_TO
		contextValueRange:
		type: string
		UEMobilityLevelContext:
		@@ -777,7 +797,7 @@ components:
		contextCondition:
		type: string
		enum:
		- Is_within_the_range
		- IS_WITHIN_RANGE
		contextValueRange:
		type: array
		items:
		@@ -794,7 +814,7 @@ components:
		contextCondition:
		type: string
		enum:
		- Is_within_the_range
		- IS_WITHIN_RANGE
		contextValueRange:
		type: array
		items:
		@@ -804,6 +824,11 @@ components:

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

		SubNetwork-Multiple:
		type: array
		items:
		$ref: '#/components/schemas/SubNetwork-Single'

		Intent-Multiple:
		type: array
		items:
		@@ -813,5 +838,6 @@ components:
		#----- Definitions in TS 28.312 for TS 28.532 --------------------------#
		resources-intentNrm:
		oneOf:
		- $ref: '#/components/schemas/SubNetwork-Single'
		- $ref: '#/components/schemas/Intent-Single'
		#----- Definitions in TS 28.312 for TS 28.532 --------------------------#

OpenAPI/TS28532_FaultMnS.yaml

+3 −5

Original line number	Diff line number	Diff line
		openapi: 3.0.1
		info:
		title: Fault Supervision MnS
		version: 17.1.0
		version: 17.2.0
		description: >-
		OAS 3.0.1 definition of the Fault Supervision MnS
		© 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
		© 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
		All rights reserved.
		externalDocs:
		description: 3GPP TS 28.532; Generic management services
		@@ -546,9 +546,7 @@ components:
		observedMeasurement:
		type: string
		observedValue:
		oneOf:
		- type: integer
		- $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float'
		type: number
		thresholdLevel:
		$ref: '#/components/schemas/ThresholdLevelInd'
		armTime: