manual resolve confliction for merge from 139 integration branch to 140... (ff434c0d) · Commits · SA5 – Management & Orchestration and Charging / Management and Orchestration APIs

OpenAPI/5gcNrm.yaml

+141 −10

Original line number	Diff line number	Diff line
		@@ -144,11 +144,6 @@ components:
		properties:
		smfServingAreas:
		type: string
		AmfInfo:
		type: object
		properties:
		priority:
		type: integer
		SupportedDataSetId:
		type: string
		description: any of enumrated value
		@@ -171,7 +166,6 @@ components:
		- $ref: '#/components/schemas/UdmInfo'
		- $ref: '#/components/schemas/AusfInfo'
		- $ref: '#/components/schemas/UpfInfo'
		- $ref: '#/components/schemas/AmfInfo'
		- $ref: '#/components/schemas/Udrinfo'
		NotificationType:
		type: string
		@@ -212,12 +206,46 @@ components:
		type: string
		hostAddr:
		$ref: 'genericNrm.yaml#/components/schemas/HostAddr'
		allowedPLMNs:
		type: array
		items:
		$ref: 'nrNrm.yaml#/components/schemas/PlmnId'
		allowedSNPNs:
		type: array
		items:
		$ref: 'nrNrm.yaml#/components/schemas/SnpnInfo'
		allowedNfTypes:
		type: array
		items:
		$ref: 'genericNrm.yaml#/components/schemas/NFType'
		allowedNfDomains:
		type: array
		items: string
		allowedNSSAIs:
		type: array
		items:
		$ref: 'nrNrm.yaml#/components/schemas/Snssai'
		locality:
		type: string
		nFInfo:
		$ref: '#/components/schemas/NFInfo'
		capacity:
		type: integer
		nfSetIdList:
		type: array
		items: string
		servingScope:
		type: array
		items: string
		nfSetRecoveryTimeList:
		type: array
		items:
		$ref: 'comDefs.yaml#/components/schemas/DateTime'
		scpDomains:
		type: array
		items: string
		vendorId:
		type: string
		SEPPType:
		type: string
		description: any of enumrated value
		@@ -493,6 +521,36 @@ components:
		type: array
		items:
		type: string
		maxNumberofPDUSessions:
		type: integer

		NRTACRange:
		type: object
		properties:
		nRTACstart:
		type: string
		nRTACend:
		type: string
		nRTACpattern:
		type: string

		TaiRange:
		type: object
		properties:
		plmnId:
		$ref: 'nrNrm.yaml#/components/schemas/PlmnId'
		nRTACRangelist:
		type: array
		items:
		$ref: '#/components/schemas/NRTACRange'

		GUAMInfo:
		type: object
		properties:
		pLMNId:
		$ref: 'nrNrm.yaml#/components/schemas/PlmnId'
		aMFIdentifier:
		type: integer

		SupportedBMOList:
		type: array
		@@ -604,10 +662,24 @@ components:
		$ref: '#/components/schemas/AmfIdentifier'
		sBIFqdn:
		type: string
		interPlmnFQDN:
		type: string
		taiList:
		$ref: 'nrNrm.yaml#/components/schemas/Tai'
		taiRangeList:
		$ref: 'nrNrm.yaml#/components/schemas/TaiRange'
		weightFactor:
		$ref: '#/components/schemas/WeightFactor'
		snssaiList:
		$ref: 'nrNrm.yaml#/components/schemas/SnssaiList'
		cNSIIdList:
		$ref: '#/components/schemas/CNSIIdList'
		gUAMIdList:
		$ref: '#/components/schemas/GUAMInfo'
		backupInfoAmfFailure:
		$ref: '#/components/schemas/GUAMInfo'
		backupInfoAmfRemoval:
		$ref: '#/components/schemas/GUAMInfo'
		amfSetRef:
		$ref: 'genericNrm.yaml#/components/schemas/Dn'
		managedNFProfile:
		@@ -1133,6 +1205,16 @@ components:
		$ref: '#/components/schemas/CapabilityList'
		isCAPIFSup:
		type: boolean
		taiList:
		items:
		$ref: 'nrNrm.yaml#/components/schemas/TaiList'
		taiRangeList:
		type: array
		items:
		$ref: '#/components/schemas/TaiRange'
		dnai:
		type: string

		- $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
		- type: object
		properties:
		@@ -1154,6 +1236,9 @@ components:
		type: array
		items:
		$ref: '#/components/schemas/NsacfInfoSnssai'
		taiList:
		items:
		$ref: 'nrNrm.yaml#/components/schemas/TaiList'
		- $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
		- type: object
		properties:
		@@ -1190,6 +1275,31 @@ components:
		EP_Npc8:
		$ref: '#/components/schemas/EP_Npc8-Multiple'

		EASDFFunction-Single:
		allOf:
		- $ref: 'genericNrm.yaml#/components/schemas/Top'
		- type: object
		properties:
		attributes:
		allOf:
		- $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
		- type: object
		properties:
		plmnId:
		$ref: 'nrNrm.yaml#/components/schemas/PlmnId'
		sBIFqdn:
		type: string
		managedNFProfile:
		$ref: '#/components/schemas/ManagedNFProfile'
		serverAddr:
		type: string
		- $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
		- type: object
		properties:
		EP_Nxx:
		$ref: '#/components/schemas/EP_Nxx-Multiple'


		ExternalAmfFunction-Single:
		allOf:
		- $ref: 'genericNrm.yaml#/components/schemas/Top'
		@@ -1753,6 +1863,21 @@ components:
		remoteAddress:
		$ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'

		EP_Nxx-Single:
		allOf:
		- $ref: 'genericNrm.yaml#/components/schemas/Top'
		- type: object
		properties:
		attributes:
		allOf:
		- $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
		- type: object
		properties:
		localAddress:
		$ref: 'nrNrm.yaml#/components/schemas/LocalAddress'
		remoteAddress:
		$ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'

		FiveQiDscpMappingSet-Single:
		allOf:
		- $ref: 'genericNrm.yaml#/components/schemas/Top'
		@@ -2166,6 +2291,10 @@ components:
		type: array
		items:
		$ref: '#/components/schemas/EP_Npc8-Single'
		EP_Nxx-Multiple:
		type: array
		items:
		$ref: '#/components/schemas/EP_Nxx-Single'
		Configurable5QISet-Multiple:
		type: array
		items:
		@@ -2241,6 +2370,7 @@ components:
		- $ref: '#/components/schemas/EP_N32-Single'
		- $ref: '#/components/schemas/EP_N33-Single'
		- $ref: '#/components/schemas/EP_N60-Single'
		- $ref: '#/components/schemas/EP_Nxx-Single'

		- $ref: '#/components/schemas/EP_S5C-Single'
		- $ref: '#/components/schemas/EP_S5U-Single'
		@@ -2252,3 +2382,4 @@ components:
		- $ref: '#/components/schemas/FiveQiDscpMappingSet-Single'
		- $ref: '#/components/schemas/PredefinedPccRuleSet-Single'
		- $ref: '#/components/schemas/Dynamic5QISet-Single'
		- $ref: '#/components/schemas/EASDFFunction-Single'

OpenAPI/nrNrm.yaml

+47 −2

Original line number	Diff line number	Diff line
		@@ -73,6 +73,22 @@ components:
		type: array
		items:
		$ref: '#/components/schemas/PlmnInfo'
		SnpnId:
		type: object
		properties:
		mcc:
		$ref: 'genericNrm.yaml#/components/schemas/Mcc'
		mnc:
		$ref: '#/components/schemas/Mnc'
		nid:
		type: string
		SnpnInfo:
		type: object
		properties:
		snpnId:
		$ref: '#/components/schemas/SnpnId'
		snssai:
		$ref: '#/components/schemas/Snssai'
		cagId:
		type: string
		nid:
		@@ -120,6 +136,28 @@ components:
		$ref: '#/components/schemas/PlmnId'
		nrTac:
		$ref: '#/components/schemas/NrTac'
		TaiList:
		type: array
		items:
		$ref: '#/components/schemas/Tai'
		NrtacRange:
		type: object
		properties:
		nRTACstart:
		type: string
		nRTACend:
		type: string
		nRTACpattern:
		type: string
		TaiRange:
		type: object
		properties:
		plmnId:
		$ref: '#/components/schemas/PlmnId'
		nRTACRangeList:
		type: array
		items:
		$ref: '#/components/schemas/NrtacRange'

		BackhaulAddress:
		type: object
		@@ -583,7 +621,14 @@ components:
		type: array
		items:
		$ref: '#/components/schemas/TceMappingInfo'

		ResourceType:
		type: string
		enum:
		- PRB
		- PRB_UL
		- PRB_DL
		- RRC
		- DRB

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

		@@ -591,7 +636,7 @@ components:
		type: object
		properties:
		resourceType:
		type: string
		$ref: '#/components/schemas/ResourceType'
		rRMPolicyMemberList:
		$ref: '#/components/schemas/RrmPolicyMemberList'

OpenAPI/sliceNrm.yaml

+19 −3

Original line number	Diff line number	Diff line
		@@ -290,7 +290,9 @@ components:
		properties:
		maxNumberofUEs:
		type: integer
		latency:
		dLLatency:
		type: integer
		uLLatency:
		type: integer
		dLThptPerSliceSubnet:
		$ref: '#/components/schemas/XLThpt'
		@@ -335,6 +337,10 @@ components:
		properties:
		coverageAreaTAList:
		type: integer
		dLLatency:
		type: integer
		uLLatency:
		type: integer
		uEMobilityLevel:
		$ref: '#/components/schemas/MobilityLevel'
		resourceSharingLevel:
		@@ -380,7 +386,9 @@ components:
		TopSliceSubnetProfile:
		type: object
		properties:
		latency:
		dLLatency:
		type: integer
		uLLatency:
		type: integer
		maxNumberofUEs:
		type: integer
		@@ -442,7 +450,9 @@ components:
		$ref: 'nrNrm.yaml#/components/schemas/PlmnInfoList'
		maxNumberofUEs:
		type: number
		latency:
		dLLatency:
		type: number
		uLLatency:
		type: number
		uEMobilityLevel:
		$ref: '#/components/schemas/MobilityLevel'
		@@ -617,6 +627,12 @@ components:
		$ref: 'genericNrm.yaml#/components/schemas/DnList'
		priorityLabel:
		type: integer
		networkSliceSubnetType:
		type: string
		enum:
		- TOP_SLICESUBNET
		- RAN_SLICESUBNET
		- CN_SLICESUBNET

		EP_Transport-Single:
		allOf: