Merge branch 'Integration_Rel17_SA5_144_YAML' into 'Rel-18' (88f7c9a3) · Commits · Miguel Angel Reina Ortega / Management and Orchestration APIs

OpenAPI/TS28536_CoslaNrm.yaml

+57 −13

Original line number	Diff line number	Diff line
		@@ -55,22 +55,57 @@ components:
		- FULFILLED
		- NOT_FULFILLED

		AssuranceTargetName:
		type: string

		AssuranceTarget:
		type: object
		properties:
		assuranceTargetName:
		type: string
		$ref: '#/components/schemas/AssuranceTargetName'
		assuranceTargetValue:
		type: string

		AssuranceTargetList:
		type: array
		items:
		$ref: '#/components/schemas/AssuranceTarget'

		AssuranceGoalStatus:
		type: object
		properties:
		assuranceGoalStatusId:
		type: string
		assuranceGoalId:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
		assuranceGoalStatusObserved:
		$ref: '#/components/schemas/AssuranceGoalStatusObserved'
		assuranceGoalStatusPredicted:
		$ref: '#/components/schemas/AssuranceGoalStatusPredicted'
		assuranceGoalRef:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

		AssuranceGoalStatusList:
		type: array
		items:
		$ref: '#/components/schemas/AssuranceGoalStatus'

		AssuranceTargetStatus:
		type: object
		properties:
		assuranceTargetStatusId:
		type: string
		assuranceTargetName:
		$ref: '#/components/schemas/AssuranceTargetName'
		assuranceTargetStatusObserved:
		$ref: '#/components/schemas/AssuranceTargetStatusObserved'
		assuranceTargetStatusPredicted:
		$ref: '#/components/schemas/AssuranceTargetStatusPredicted'

		AssuranceTargetList:
		AssuranceTargetStatusList:
		type: array
		items:
		$ref: '#/components/schemas/AssuranceTarget'
		$ref: '#/components/schemas/AssuranceTargetStatus'

		AttributeNameList:
		type: array
		@@ -149,6 +184,10 @@ components:
		$ref: '#/components/schemas/ACCLDisallowedAttributes'
		AssuranceGoal:
		$ref: '#/components/schemas/AssuranceGoal-Multiple'
		networkSliceRef:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
		networkSliceSubnetRef:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

		AssuranceGoal-Single:
		allOf:
		@@ -163,20 +202,24 @@ components:
		$ref: '#/components/schemas/ObservationTime'
		assuranceTargetList:
		$ref: '#/components/schemas/AssuranceTargetList'
		assuranceGoalStatusObserved:
		$ref: '#/components/schemas/AssuranceGoalStatusObserved'
		assuranceGoalStatusPredicted:
		$ref: '#/components/schemas/AssuranceGoalStatusPredicted'
		assuranceScope:
		$ref: '#/components/schemas/AssuranceScope'
		serviceProfileId:
		type: string
		sliceProfileId:
		type: string
		networkSliceRef:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
		networkSliceSubnetRef:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

		AssuranceReport-Single:
		allOf:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
		- type: object
		properties:
		attributes:
		allOf:
		- type: object
		properties:
		assuranceGoalStatusList:
		$ref: '#/components/schemas/AssuranceGoalStatusList'

		#-------- Definition of JSON arrays for name-contained IOCs ----------------------
		SubNetwork-Multiple:
		@@ -206,5 +249,6 @@ components:
		- $ref: '#/components/schemas/MnS'
		- $ref: '#/components/schemas/AssuranceClosedControlLoop-Single'
		- $ref: '#/components/schemas/AssuranceGoal-Single'
		- $ref: '#/components/schemas/AssuranceReport-Single'
		- $ref: '#/components/schemas/SubNetwork-Single'
		- $ref: '#/components/schemas/ManagedElement-Single'

OpenAPI/TS28623_ComDefs.yaml

+42 −0

Original line number	Diff line number	Diff line
		@@ -56,12 +56,54 @@ components:
		Tac:
		type: string
		pattern: '(^[A-Fa-f0-9]{4}$)\|(^[A-Fa-f0-9]{6}$)'
		UtraCellId:
		type: integer
		EutraCellId:
		type: string
		pattern: '^[A-Fa-f0-9]{7}$'
		NrCellId:
		type: string
		pattern: '^[A-Fa-f0-9]{9}$'
		TimeWindow:
		type: object
		properties:
		startTime:
		$ref: '#/components/schemas/DateTime'
		endTime:
		$ref: '#/components/schemas/DateTime'
		GeoCoordinate:
		type: object
		properties:
		latitude:
		$ref: '#/components/schemas/Latitude'
		longitude:
		$ref: '#/components/schemas/Longitude'
		ConvexGeoPolygon:
		type: array
		items:
		$ref: '#/components/schemas/GeoCoordinate'
		GeoAreaToCellMapping:
		type: object
		properties:
		convexGeoPolygon:
		$ref: '#/components/schemas/ConvexGeoPolygon'
		associationThreshold:
		type: integer
		AreaOfInterest:
		oneOf:
		- $ref: '#/components/schemas/GeoAreaToCellMapping'
		- type: array
		items:
		$ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai'
		- type: array
		items:
		$ref: '#/components/schemas/NrCellId'
		- type: array
		items:
		$ref: '#/components/schemas/EutraCellId'
		- type: array
		items:
		$ref: '#/components/schemas/UtraCellId'

		Fqdn:
		type: string

OpenAPI/TS28623_GenericNrm.yaml

+76 −5

Original line number	Diff line number	Diff line
		@@ -323,6 +323,37 @@ components:
		- $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr'
		- $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr'

		ManagementData:
		oneOf:
		- type: array
		items:
		type: string
		enum:
		- COVERAGE
		- CAPACITY
		- ENERGY_EFFICIENCY
		- MOBILITY
		- ACCESSIBILITY
		- type: array
		items:
		type: string
		NodeFilter:
		type: object
		properties:
		areaOfInterest:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/AreaOfInterest'
		networkDomain:
		type: string
		enum:
		- CN
		- RAN
		cpUpType:
		type: string
		enum:
		- CP
		- UP
		sst:
		type: integer

		#-------- Definition of types used in Trace control NRM fragment------------------

		@@ -1441,6 +1472,10 @@ components:
		type: array
		items:
		$ref: '#/components/schemas/SupportedPerfMetricGroup'
		supportedTraceMetrics:
		type: array
		items:
		type: string
		ManagedElement-Attr:
		type: object
		properties:
		@@ -1468,6 +1503,10 @@ components:
		type: array
		items:
		$ref: '#/components/schemas/SupportedPerfMetricGroup'
		supportedTraceMetrics:
		type: array
		items:
		type: string

		SubNetwork-ncO:
		type: object
		@@ -1482,10 +1521,12 @@ components:
		$ref: '#/components/schemas/PerfMetricJob-Multiple'
		ThresholdMonitor:
		$ref: '#/components/schemas/ThresholdMonitor-Multiple'
		NtfSubscriptionControl:
		$ref: '#/components/schemas/NtfSubscriptionControl-Multiple'
		TraceJob:
		$ref: '#/components/schemas/TraceJob-Multiple'
		ManagementDataCollection:
		$ref: '#/components/schemas/ManagementDataCollection-Multiple'
		NtfSubscriptionControl:
		$ref: '#/components/schemas/NtfSubscriptionControl-Multiple'
		AlarmList:
		$ref: '#/components/schemas/AlarmList-Single'
		FileDownloadJob:
		@@ -1503,10 +1544,10 @@ components:
		$ref: '#/components/schemas/PerfMetricJob-Multiple'
		ThresholdMonitor:
		$ref: '#/components/schemas/ThresholdMonitor-Multiple'
		NtfSubscriptionControl:
		$ref: '#/components/schemas/NtfSubscriptionControl-Multiple'
		TraceJob:
		$ref: '#/components/schemas/TraceJob-Multiple'
		NtfSubscriptionControl:
		$ref: '#/components/schemas/NtfSubscriptionControl-Multiple'
		AlarmList:
		$ref: '#/components/schemas/AlarmList-Single'
		FileDownloadJob:
		@@ -1535,6 +1576,10 @@ components:
		type: array
		items:
		$ref: '#/components/schemas/SupportedPerfMetricGroup'
		supportedTraceMetrics:
		type: array
		items:
		type: string
		EP_RP-Attr:
		type: object
		properties:
		@@ -1849,6 +1894,27 @@ components:
		$ref: '#/components/schemas/TraceJob-Attr'
		Files:
		$ref: '#/components/schemas/Files-Multiple'
		ManagementDataCollection-Single:
		allOf:
		- $ref: '#/components/schemas/Top'
		- type: object
		properties:
		attributes:
		type: object
		properties:
		managementData:
		$ref: '#/components/schemas/ManagementData'
		targetNodeFilter:
		$ref: '#/components/schemas/NodeFilter'
		collectionTimeWindow:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow'
		reportingCtrl:
		type: string
		dataScope:
		type: string
		enum:
		- SNSSAI
		- 5QI
		AlarmList-Single:
		allOf:
		- $ref: '#/components/schemas/Top'
		@@ -2001,6 +2067,10 @@ components:
		type: array
		items:
		$ref: '#/components/schemas/TraceJob-Single'
		ManagementDataCollection-Multiple:
		type: array
		items:
		$ref: '#/components/schemas/ManagementDataCollection-Single'
		NtfSubscriptionControl-Multiple:
		type: array
		items:
		@@ -2038,6 +2108,7 @@ components:
		- $ref: '#/components/schemas/PerfMetricJob-Single'
		- $ref: '#/components/schemas/ThresholdMonitor-Single'
		- $ref: '#/components/schemas/TraceJob-Single'
		- $ref: '#/components/schemas/ManagementDataCollection-Single'

		- $ref: '#/components/schemas/NtfSubscriptionControl-Single'
		- $ref: '#/components/schemas/HeartbeatControl-Single'