manual fix the merge confliction for CR0789 (a9377fc8) · Commits · Miguel Angel Reina Ortega / Management and Orchestration APIs

OpenAPI/TS28541_5GcNrm.yaml

+41 −2

Original line number	Diff line number	Diff line
		@@ -824,6 +824,45 @@ components:
		minItems: 1
		minProperties: 1

		NsacfCapability:
		description: >
		NSACF service capabilities (e.g. to monitor and control the number of registered UEs
		or established PDU sessions per network slice)
		type: object
		properties:
		supportUeSAC:
		description: \|
		Indicates the service capability of the NSACF to monitor and control the number of
		registered UEs per network slice for the network slice that is subject to NSAC
		true: Supported
		false (default): Not Supported
		type: boolean
		default: false
		supportPduSAC:
		description: \|
		Indicates the service capability of the NSACF to monitor and control the number of
		established PDU sessions per network slice for the network slice that is subject to NSAC
		true: Supported
		false (default): Not Supported
		type: boolean
		default: false

		NsacfInfo:
		description: Information of a NSACF NF Instance
		type: object
		required:
		- nsacfCapability
		properties:
		nsacfCapability:
		$ref: '#/components/schemas/NsacfCapability'
		taiList:
		$ref: '#/components/schemas/TaiList'
		taiRangeList:
		type: array
		items:
		$ref: '#/components/schemas/TaiRange'
		minItems: 1

		#-------- Definition of concrete IOCs --------------------------------------------
		ProvMnS:
		oneOf:
		@@ -1638,8 +1677,8 @@ components:
		type: array
		items:
		$ref: '#/components/schemas/NsacfInfoSnssai'
		taiList:
		$ref: '#/components/schemas/TaiList'
		nsacfInfo:
		$ref: '#/components/schemas/NsacfInfo'
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
		- type: object
		properties: