Address the conflict issue (c710ed3c) · Commits · SA5 – Management & Orchestration and Charging / Management and Orchestration APIs

OpenAPI/TS28312_IntentExpectations.yaml

+83 −1

Original line number	Diff line number	Diff line
		@@ -43,6 +43,36 @@ components:
		- $ref: "#/components/schemas/RANEnergyConsumptionTarget"
		- $ref: "#/components/schemas/RANEnergyEfficiencyTarget"
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget'
		expectationContexts:
		type: array
		items:
		type: object
		oneOf:
		- $ref: '#/components/schemas/TargetAssuranceTimeContext'
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext'
		required:
		- expectationId
		RadioServiceExpectation:
		description: >-
		This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for radio service delivering
		type: object
		properties:
		expectationId:
		type: string
		expectationVerb:
		$ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb"
		expectationObject:
		$ref: "#/components/schemas/RadioServiceExpectationObject"
		expectationTargets:
		type: array
		items:
		type: object
		oneOf:
		- $ref: '#/components/schemas/DLLatencyTarget'
		- $ref: '#/components/schemas/ULLatencyTarget'
		- $ref: '#/components/schemas/DLThptPerUETarget'
		- $ref: '#/components/schemas/ULThptPerUETarget'
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget'
		expectationContexts:
		type: array
		items:
		@@ -140,6 +170,25 @@ components:
		- $ref: '#/components/schemas/RATContext'
		- $ref: "#/components/schemas/UEGroupContext"
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext'
		RadioServiceExpectationObject:
		description: >-
		This data type is the "ExpectationObject" data type with specialisations for RadioServicekExpectation
		type: object
		properties:
		objectType:
		type: string
		enum:
		- Radio_Service
		objectInstance:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
		objectContexts:
		type: array
		items:
		type: object
		oneOf:
		- $ref: '#/components/schemas/CoverageAreaPolygonContext'
		- $ref: '#/components/schemas/ServiceTypeContext'
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext'
		ServiceSupportExpectationObject:
		description: >-
		This data type is the "ExpectationObject" data type with specialisations for EdgeServiceSupportExpectation
		@@ -862,6 +911,23 @@ components:
		#-------Definition of the scenario specific ObjectTarget dataType----------------#

		#-------Definition of the concrete ExpectationContext dataType----------------#

		TargetAssuranceTimeContext:
		description: >-
		This data type is the "Expectation Context" data type with specialisations for TargetAssuranceTimeContext
		type: object
		properties:
		contextAttribute:
		type: string
		enum:
		- TargetAssuranceTime
		contextCondition:
		type: string
		enum:
		- IS_EQUAL_TO
		contextValueRange:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow'

		ServiceStartTimeContext:
		description: >-
		This data type is the "ExpectationContext" data type with specialisations for ServiceStartTimeContext
		@@ -922,4 +988,20 @@ components:
		- IS_EQUAL_TO
		contextValueRange:
		$ref: "TS28541_SliceNrm.yaml#/components/schemas/SharingLevel"
		ServiceTypeContext:
		description: >-
		This data type is the "ExpectationContext" data type with specialisations for ServiceTypeContext
		type: object
		properties:
		contextAttribute:
		type: string
		enum:
		- ServiceType
		contextCondition:
		type: string
		enum:
		- IS_EQUAL_TO
		contextValueRange:
		$ref: "TS28541_NrNrm.yaml#/components/schemas/Sst"

		#-------Definition of the concrete ExpectionContext dataType----------------#

OpenAPI/TS28312_IntentNrm.yaml

+6 −7

Original line number	Diff line number	Diff line
		@@ -45,6 +45,7 @@ components:
		- $ref: "#/components/schemas/IntentExpectation"
		- $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioNetworkExpectation"
		- $ref: "TS28312_IntentExpectations.yaml#/components/schemas/EdgeServiceSupportExpectation"
		- $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioServiceExpectation"
		intentContexts:
		type: array
		items:
		@@ -66,16 +67,12 @@ components:
		- type: object
		properties:
		intentFulfilmentReport:
		type: array
		items:
		$ref: '#/components/schemas/IntentFulfilmentReport'
		intentConflictReports:
		type: array
		items:
		$ref: '#/components/schemas/IntentConflictReport'
		intentFeasibilityCheckReport:
		type: array
		items:
		$ref: '#/components/schemas/IntentFeasibilityCheckReport'
		lastUpdated:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
		@@ -343,6 +340,8 @@ components:
		This data type is the "IntentConflictReport" data type without specialisations
		type: object
		properties:
		conflictId:
		type: string
		conflictType:
		type: string
		enum:

OpenAPI/TS28541_5GcNrm.yaml

+123 −9

Original line number	Diff line number	Diff line
		@@ -1596,14 +1596,14 @@ components:
		UpfInfo:
		description: Information of an UPF NF Instance
		type: object
		# required:
		# - sNssaiUpfInfoList
		required:
		- sNssaiUpfInfoList
		properties:
		# sNssaiUpfInfoList:
		# type: array
		# items:
		# $ref: '#/components/schemas/SnssaiUpfInfoItem'
		# minItems: 1
		sNssaiUpfInfoList:
		type: array
		items:
		$ref: '#/components/schemas/SnssaiUpfInfoItem'
		minItems: 1
		smfServingArea:
		type: array
		items:
		@@ -1617,8 +1617,8 @@ components:
		iwkEpsInd:
		type: boolean
		default: false
		# sxaInd:
		# type: boolean
		sxaInd:
		type: boolean
		pduSessionTypes:
		type: array
		items:
		@@ -1669,6 +1669,95 @@ components:
		# $ref: 'TS29564_Nupf_EventExposure.yaml#/components/schemas/EventType'
		# minItems: 1

		# SnssaiUpfInfoItem/IpIndex/DnnUpfInfoItem stage2/3 introduced in SnssaiUpfInfoItem is introduced in CR1020 (via S5-236244)
		# the stage 3 for these threes are only for validation. When merged in integration branch,
		# the stage 3 for these three shall only keep one copy
		SnssaiUpfInfoItem:
		description: Set of parameters supported by UPF for a given S-NSSAI
		type: object
		required:
		- sNssai
		- dnnUpfInfoList
		properties:
		sNssai:
		$ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai'
		dnnUpfInfoList:
		type: array
		items:
		$ref: '#/components/schemas/DnnUpfInfoItem'
		minItems: 1
		redundantTransport:
		type: boolean
		default: false
		IpIndex:
		description: Represents the IP Index to be sent from UDM to the SMF (its value can be either an integer or a string)
		anyOf:
		- type: integer
		- type: string
		DnnUpfInfoItem:
		description: Set of parameters supported by UPF for a given DNN
		type: object
		required:
		- dnn
		properties:
		dnn:
		$ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn'
		dnaiList:
		type: array
		items:
		$ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai'
		minItems: 1
		pduSessionTypes:
		type: array
		items:
		$ref: 'TS29571_CommonData.yaml#/components/schemas/PduSessionType'
		minItems: 1
		ipv4AddressRanges:
		type: array
		items:
		$ref: '#/components/schemas/Ipv4AddressRange'
		minItems: 1
		ipv6PrefixRanges:
		type: array
		items:
		$ref: '#/components/schemas/Ipv6PrefixRange'
		minItems: 1
		natedIpv4AddressRanges:
		type: array
		items:
		$ref: '#/components/schemas/Ipv4AddressRange'
		minItems: 1
		natedIpv6PrefixRanges:
		type: array
		items:
		$ref: '#/components/schemas/Ipv6PrefixRange'
		minItems: 1
		ipv4IndexList:
		type: array
		items:
		$ref: '#/components/schemas/IpIndex'
		minItems: 1
		ipv6IndexList:
		type: array
		items:
		$ref: '#/components/schemas/IpIndex'
		minItems: 1
		networkInstance:
		description: >
		The N6 Network Instance associated with the S-NSSAI and DNN.
		type: string
		dnaiNwInstanceList:
		description: >
		Map of network instance per DNAI for the DNN, where the key of the map is the DNAI.
		When present, the value of each entry of the map shall contain a N6 network instance
		that is configured for the DNAI indicated by the key.
		type: object
		additionalProperties:
		type: string
		minProperties: 1
		not:
		required: [ networkInstance, dnaiNwInstanceList ]

		PcfInfo:
		description: Information of a PCF NF Instance
		type: object
		@@ -1704,6 +1793,25 @@ components:
		$ref: '#/components/schemas/ProseCapability'
		v2xCapability:
		$ref: '#/components/schemas/V2xCapability'
		a2xSupportInd:
		type: boolean
		default: false
		a2xCapability:
		$ref: '#/components/schemas/A2xCapability'
		rangingSlPosSupportInd:
		type: boolean
		default: false

		A2xCapability:
		description: Information of the supported A2X Capability by the PCF
		type: object
		properties:
		lteA2x:
		type: boolean
		default: false
		nrA2x:
		type: boolean
		default: false

		NefInfo:
		description: Information of an NEF NF Instance
		@@ -1751,6 +1859,12 @@ components:
		uasNfFunctionalityInd:
		type: boolean
		default: false
		multiMemAfSessQosInd:
		type: boolean
		default: false
		memberUESelAssistInd:
		type: boolean
		default: false

		NrfInfo:
		description: Information of an NRF NF Instance, used in hierarchical NRF deployments

OpenAPI/TS28541_NrNrm.yaml

+14 −2

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@ components:
		$ref: '#/components/schemas/Sst'
		sd:
		type: string
		pattern: '^[A-Fa-f0-9]{6}$'

		PlmnIdList:
		type: array
		@@ -65,13 +66,24 @@ components:
		type: string
		NpnIdentity:
		type: object
		oneOf:
		- required: [ plmnId, cagidList ]
		- required: [ plmnId, nidList ]
		properties:
		plmnId:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
		cagidList:
		type: array
		items:
		$ref: '#/components/schemas/cagId'
		minItems: 1
		maxItems: 12
		nidList:
		type: array
		items:
		$ref: '#/components/schemas/nid'
		minItems: 1
		maxItems: 12
		NpnIdentityList:
		type: array
		items:

OpenAPI/TS28623_ComDefs.yaml

+40 −6

Original line number	Diff line number	Diff line
		@@ -19,6 +19,23 @@ components:
		DateTime:
		type: string
		format: date-time
		FullTime:
		type: string
		description: format (e.g., full-time) is from RFC 3339
		format: full-time
		DateMonth:
		type: string
		format: date-month
		DateMonthDay:
		type: string
		format: date-mday
		DayInYear:
		type: object
		properties:
		month:
		$ref: '#/components/schemas/DateMonth'
		monthDay:
		$ref: '#/components/schemas/DateMonthDay'
		Latitude:
		type: number
		format: float
		@@ -65,10 +82,19 @@ components:
		type: string
		pattern: '^[A-Fa-f0-9]{9}$'
		TimeWindow:
		type: object
		oneOf:
		- type: object
		properties:
		startTime:
		$ref: '#/components/schemas/DateTime'
		endTime:
		$ref: '#/components/schemas/DateTime'
		- type: object
		properties:
		startTime:
		$ref: '#/components/schemas/DateTime'
		- type: object
		properties:
		endTime:
		$ref: '#/components/schemas/DateTime'
		GeoCoordinate:
		@@ -150,6 +176,14 @@ components:
		Uri:
		type: string

		TimeInterval:
		type: object
		properties:
		intervalStart:
		$ref: '#/components/schemas/FullTime'
		intervalEnd:
		$ref: '#/components/schemas/FullTime'

		AdministrativeState:
		type: string
		enum: