manual fix the merge confliction for CR0788 (7e4aca33) · Commits · Miguel Angel Reina Ortega / Management and Orchestration APIs

OpenAPI/TS28541_5GcNrm.yaml

+134 −1

Original line number	Diff line number	Diff line
		@@ -1037,6 +1037,106 @@ components:
		items:
		$ref: '#/components/schemas/ScpCapability'

		PfdData:
		description: List of Application IDs and/or AF IDs managed by a given NEF Instance
		type: object
		properties:
		appIds:
		type: array
		items:
		type: string
		minItems: 1
		afIds:
		type: array
		items:
		type: string
		minItems: 1
		AfEvent:
		description: Represents Application Events.
		anyOf:
		- type: string
		enum:
		- SVC_EXPERIENCE
		- UE_MOBILITY
		- UE_COMM
		- EXCEPTIONS
		- USER_DATA_CONGESTION
		- PERF_DATA
		- DISPERSION
		- COLLECTIVE_BEHAVIOUR
		- MS_QOE_METRICS
		- MS_CONSUMPTION
		- MS_NET_ASSIST_INVOCATION
		- MS_DYN_POLICY_INVOCATION
		- MS_ACCESS_ACTIVITY
		- type: string
		description: >
		This string provides forward-compatibility with future extensions to the enumeration but
		is not used to encode content defined in the present version of this API.
		AfEventExposureData:
		description: AF Event Exposure data managed by a given NEF Instance
		type: object
		required:
		- afEvents
		properties:
		afEvents:
		type: array
		items:
		$ref: '#/components/schemas/AfEvent'
		minItems: 1
		afIds:
		type: array
		items:
		type: string
		minItems: 1
		appIds:
		type: array
		items:
		type: string
		minItems: 1
		UnTrustAfInfo:
		description: Information of a untrusted AF Instance
		type: object
		required:
		- afId
		properties:
		afId:
		type: string
		sNssaiInfoList:
		type: array
		items:
		$ref: '#/components/schemas/SnssaiInfoItem'
		minItems: 1
		mappingInd:
		type: boolean
		default: false
		SnssaiInfoItem:
		description: >
		Parameters supported by an NF for a given S-NSSAI Set of parameters supported by NF
		for a given S-NSSAI
		type: object
		required:
		- sNssai
		- dnnInfoList
		properties:
		sNssai:
		$ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai'
		dnnInfoList:
		type: array
		items:
		$ref: '#/components/schemas/DnnInfoItem'
		minItems: 1
		DnnInfoItem:
		description: Set of parameters supported by NF for a given DNN
		type: object
		required:
		- dnn
		properties:
		dnn:
		anyOf:
		- $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn'
		- $ref: 'TS29571_CommonData.yaml#/components/schemas/WildcardDnn'

		#-------- Definition of concrete IOCs --------------------------------------------
		ProvMnS:
		oneOf:
		@@ -1829,7 +1929,40 @@ components:
		$ref: '#/components/schemas/TaiRange'
		dnai:
		type: string

		nefId:
		type: string
		pfdData:
		$ref: '#/components/schemas/PfdData'
		afEeData:
		$ref: '#/components/schemas/AfEventExposureData'
		gpsiRanges:
		type: array
		items:
		$ref: '#/components/schemas/IdentityRange'
		minItems: 1
		externalGroupIdentifiersRanges:
		type: array
		items:
		$ref: '#/components/schemas/IdentityRange'
		minItems: 1
		servedFqdnList:
		type: array
		items:
		type: string
		minItems: 1
		dnaiList:
		type: array
		items:
		$ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai'
		minItems: 1
		unTrustAfInfoList:
		type: array
		items:
		$ref: '#/components/schemas/UnTrustAfInfo'
		minItems: 1
		uasNfFunctionalityInd:
		type: boolean
		default: false
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
		- type: object
		properties: