Code Moderator: Address the implementation conflict (a9644446) · Commits · SA5 – Management & Orchestration and Charging / Management and Orchestration APIs

OpenAPI/TS28105_AiMlNrm.yaml

+1 −1

Original line number	Diff line number	Diff line
		@@ -222,7 +222,7 @@ components:
		type: array
		items:
		type: string
		confidenceIndication:
		modelConfidenceIndication:
		type: integer
		modelPerformanceTraining:
		type: array

OpenAPI/TS28312_IntentExpectations.yaml

+27 −5

Original line number	Diff line number	Diff line
		@@ -166,7 +166,8 @@ components:
		- $ref: '#/components/schemas/CoverageAreaPolygonContext'
		- $ref: '#/components/schemas/CoverageTACContext'
		- $ref: '#/components/schemas/PLMNContext'
		- $ref: '#/components/schemas/NRFqBandContext'
		- $ref: '#/components/schemas/DlFrequencyContext'
		- $ref: '#/components/schemas/UlFrequencyContext'
		- $ref: '#/components/schemas/RATContext'
		- $ref: "#/components/schemas/UEGroupContext"
		- $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext'
		@@ -737,15 +738,17 @@ components:
		type: array
		items:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
		NRFqBandContext:
		DlFrequencyContext:
		description: >-
		This data type is the "ObjectContext" data type with specialisations for NRFqBandContext
		This data type is the "Context" data type with specialisations for Object context "DLFrequencyContext".
		It describes the downlink frequency information (RF reference frequencies and/ or the
		frequency operating band) supported by the RAN SubNetwork that the intent expectation is applied.
		type: object
		properties:
		contextAttribute:
		type: string
		enum:
		- NRFqBand
		- DlFrequency
		contextCondition:
		type: string
		enum:
		@@ -753,7 +756,26 @@ components:
		contextValueRange:
		type: array
		items:
		$ref: 'TS28312_IntentNrm.yaml#/components/schemas/Frequency'
		UlFrequencyContext:
		description: >-
		This data type is the "Context" data type with specialisations for Object context "DLFrequencyContext".
		It describes the uplink frequency information (RF reference frequencies and/ or the frequency
		operating band) supported by the RAN SubNetwork that the intent expectation is applied.
		type: object
		properties:
		contextAttribute:
		type: string
		enum:
		- UlFrequency
		contextCondition:
		type: string
		enum:
		- IS_ALL_OF
		contextValueRange:
		type: array
		items:
		$ref: 'TS28312_IntentNrm.yaml#/components/schemas/Frequency'
		RATContext:
		description: >-
		This data type is the "ObjectContext" data type with specialisations for RATContext

OpenAPI/TS28312_IntentNrm.yaml

+21 −3

Original line number	Diff line number	Diff line
		@@ -201,6 +201,23 @@ components:
		enum:
		- DELIVER
		- ENSURE
		Frequency:
		description: >-
		It desribes the RF reference frequency (i.e. Absolute Radio Frequency Channel Number)
		and/or the frequency operating band used for a given direction (UL or DL) in FDD or
		for both UL and DL directions in TDD.
		type: object
		properties:
		arfcn:
		type: integer
		description: >-
		This attribute shall be supported, when the frequency information represent RF reference frequency.
		The allowed values for NR see TS 38.104 subclause 5.4.2.1; The allowed values for EUTRAN see TS 36.104 [X] subclause 5.7.3;
		freqband:
		type: string
		description: >-
		This attribute shall be supported, when the frequency information represent frequency operating band.
		The allowed values for NR see TS 38.104 subclause 5.4.2.3; The allowed value for EUTRAN see TS 36.104 subclause 5.7.3
		ValueRangeType:
		oneOf:
		- type: number
		@@ -213,6 +230,7 @@ components:
		- $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
		- $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate'
		- $ref: '#/components/schemas/UEGroup'
		- $ref: '#/components/schemas/Frequency'
		UEGroup:
		description: >-
		It describes the UE Group, which is

OpenAPI/TS28541_5GcNrm.yaml

+335 −20

Original line number	Diff line number	Diff line
		@@ -123,12 +123,28 @@ components:
		CNSIId:
		type: string
		description: CNSI Id is defined in TS 29.531, only for Core Network
		EnergySavingControl:
		type: string
		description: any of enumerated value
		enum:
		- TO_BE_ENERGYSAVING
		- TO_BE_NOT_ENERGYSAVING
		EnergySavingState:
		type: string
		description: any of enumerated value
		enum:
		- IS_NOT_ENERGYSAVING
		- IS_ENERGYSAVING
		TACList:
		type: array
		items:
		$ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac'
		WeightFactor:
		type: integer
		VendorId:
		type: string
		description: Vendor ID of the NF Service instance (Private Enterprise Number assigned by IANA)
		pattern: '^[0-9]{6}$'
		AusfInfo:
		type: object
		properties:
		@@ -270,7 +286,7 @@ components:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
		minItems: 1
		vendorId:
		type: string
		$ref: '#/components/schemas/VendorId'
		SEPPType:
		type: string
		description: any of enumerated value
		@@ -968,7 +984,22 @@ components:
		$ref: '#/components/schemas/SnssaiList'
		trackingAreaList:
		$ref: '#/components/schemas/TaiList'

		mlModelInterInfo:
		type: array
		items:
		$ref: '#/components/schemas/VendorId'
		minItems: 0
		flCapabilityType:
		type: string
		enum:
		- FL_SERVER
		- FL_CLIENT
		- FL_SERVER_AND_CLIENT
		flTimeInterval:
		type: array
		items:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow'
		minItems: 1
		NwdafInfo:
		description: Information of a NWDAF NF Instance
		type: object
		@@ -2052,18 +2083,18 @@ components:
		# additionalProperties:
		# $ref: '#/components/schemas/NfInfo'
		# minProperties: 1
		# servedHssInfoList:
		# description: A map (list of key-value pairs) where nfInstanceId serves as key
		# type: object
		# additionalProperties:
		# description: A map (list of key-value pairs) where a valid JSON string serves as key
		# type: object
		# additionalProperties:
		# anyOf:
		# - $ref: '#/components/schemas/HssInfo'
		# - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
		# minProperties: 1
		# minProperties: 1
		servedHssInfoList:
		description: A map (list of key-value pairs) where nfInstanceId serves as key
		type: object
		additionalProperties:
		description: A map (list of key-value pairs) where a valid JSON string serves as key
		type: object
		additionalProperties:
		anyOf:
		- $ref: '#/components/schemas/HssInfo'
		- $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
		minProperties: 1
		minProperties: 1
		servedUdsfInfo:
		description: A map (list of key-value pairs) where nfInstanceId serves as key
		type: object
		@@ -2100,6 +2131,75 @@ components:
		- $ref: '#/components/schemas/SeppInfo'
		- $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
		minProperties: 1
		servedAanfInfoList:
		description: A map (list of key-value pairs) where NF Instance Id serves as key
		type: object
		additionalProperties:
		description: A map (list of key-value pairs) where a valid JSON string serves as key
		type: object
		additionalProperties:
		anyOf:
		- $ref: '#/components/schemas/AanfInfo'
		- $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
		minProperties: 1
		served5gDdnmfInfo:
		type: object
		additionalProperties:
		$ref: '#/components/schemas/5GDdnmfInfo'
		minProperties: 1
		servedMfafInfoList:
		type: object
		description: A map (list of key-value pairs) where NF Instance Id serves as key
		additionalProperties:
		$ref: '#/components/schemas/MfafInfo'
		minProperties: 1
		servedEasdfInfoList:
		type: object
		description: A map (list of key-value pairs) where NF Instance Id serves as key
		additionalProperties:
		type: object
		description: A map (list of key-value pairs) where a valid JSON string serves as key
		additionalProperties:
		$ref: '#/components/schemas/EasdfInfo'
		minProperties: 1
		servedDccfInfoList:
		type: object
		description: A map (list of key-value pairs) where NF Instance Id serves as key
		additionalProperties:
		$ref: '#/components/schemas/DccfInfo'
		minProperties: 1
		servedMbSmfInfoList:
		description: A map (list of key-value pairs) where nfInstanceId serves as key
		type: object
		additionalProperties:
		description: A map (list of key-value pairs) where a valid JSON string serves as key
		type: object
		additionalProperties:
		anyOf:
		- $ref: '#/components/schemas/MbSmfInfo'
		- $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject'
		minProperties: 1
		minProperties: 1
		servedTsctsfInfoList:
		type: object
		description: A map (list of key-value pairs) where NF Instance Id serves as key
		additionalProperties:
		type: object
		description: A map (list of key-value pairs) where a valid JSON string serves as key
		additionalProperties:
		$ref: '#/components/schemas/TsctsfInfo'
		minProperties: 1
		minProperties: 1
		servedMbUpfInfoList:
		type: object
		description: A map (list of key-value pairs) where NF Instance Id serves as key
		additionalProperties:
		type: object
		description: A map (list of key-value pairs) where a valid JSON string serves as key
		additionalProperties:
		$ref: '#/components/schemas/MbUpfInfo'
		minProperties: 1
		minProperties: 1
		servedTrustAfInfo:
		type: object
		description: A map (list of key-value pairs) where NF Instance Id serves as key
		@@ -2142,6 +2242,82 @@ components:
		blockedDurEndTime:
		$ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'

		5GDdnmfInfo:
		description: Information of an 5G DDNMF NF Instance
		type: object
		required:
		- plmnId
		properties:
		plmnId:
		$ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId'
		ImsiRange:
		description: >
		A range of IMSIs (subscriber identities), either based on a numeric range,
		or based on regular-expression matching
		type: object
		oneOf:
		- required: [ start, end ]
		- required: [ pattern ]
		properties:
		start:
		type: string
		pattern: '^[0-9]+$'
		end:
		type: string
		pattern: '^[0-9]+$'
		pattern:
		type: string
		NetworkNodeDiameterAddress:
		description: >
		This data type is a part of smsfDiameterAddress and it should be present
		whenever smsf supports Diameter protocol.
		type: object
		required:
		- name
		- realm
		properties:
		name:
		$ref: 'TS29571_CommonData.yaml#/components/schemas/DiameterIdentity'
		realm:
		$ref: 'TS29571_CommonData.yaml#/components/schemas/DiameterIdentity'
		HssInfo:
		description: Information of an HSS NF Instance
		type: object
		properties:
		groupId:
		$ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId'
		imsiRanges:
		type: array
		items:
		$ref: '#/components/schemas/ImsiRange'
		minItems: 1
		imsPrivateIdentityRanges:
		type: array
		items:
		$ref: '#/components/schemas/IdentityRange'
		minItems: 1
		imsPublicIdentityRanges:
		type: array
		items:
		$ref: '#/components/schemas/IdentityRange'
		minItems: 1
		msisdnRanges:
		type: array
		items:
		$ref: '#/components/schemas/IdentityRange'
		minItems: 1
		externalGroupIdentifiersRanges:
		type: array
		items:
		$ref: '#/components/schemas/IdentityRange'
		minItems: 1
		hssDiameterAddress:
		$ref: '#/components/schemas/NetworkNodeDiameterAddress'
		additionalDiamAddresses:
		type: array
		items:
		$ref: '#/components/schemas/NetworkNodeDiameterAddress'
		minItems: 1
		GmlcInfo:
		description: Information of a GMLC NF Instance
		type: object
		@@ -2574,6 +2750,17 @@ components:
		minProperties: 1
		not:
		required: [ networkInstance, dnaiNwInstanceList ]
		MnpfInfo:
		description: Information of an MNPF Instance
		type: object
		properties:
		msisdnRanges:
		type: array
		items:
		$ref: '#/components/schemas/IdentityRange'
		minItems: 1
		required:
		- msisdnRanges

		#-------- Definition of concrete IOCs --------------------------------------------
		ProvMnS:
		@@ -2696,6 +2883,8 @@ components:
		$ref: '#/components/schemas/MbSmfFunction-Multiple'
		MBUPFFunction:
		$ref: '#/components/schemas/MbUpfFunction-Multiple'
		MNPFFunction:
		$ref: '#/components/schemas/MnpfFunction-Multiple'

		AmfFunction-Single:
		allOf:
		@@ -2882,6 +3071,10 @@ components:
		$ref: '#/components/schemas/TACList'
		cNSIIdList:
		$ref: '#/components/schemas/CNSIIdList'
		energySavingControl:
		$ref: '#/components/schemas/EnergySavingControl'
		energySavingState:
		$ref: '#/components/schemas/EnergySavingState'
		managedNFProfile:
		$ref: '#/components/schemas/ManagedNFProfile'
		supportedBMOList:
		@@ -3099,6 +3292,8 @@ components:
		$ref: '#/components/schemas/EP_N27-Multiple'
		EP_N96:
		$ref: '#/components/schemas/EP_N96-Multiple'
		EP_SM14:
		$ref: '#/components/schemas/EP_SM14-Multiple'
		NssfFunction-Single:
		allOf:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
		@@ -3115,8 +3310,8 @@ components:
		type: string
		cNSIIdList:
		$ref: '#/components/schemas/CNSIIdList'
		nFProfileList:
		$ref: '#/components/schemas/NFProfileList'
		managedNFProfile:
		$ref: '#/components/schemas/ManagedNFProfile'
		commModelList:
		$ref: '#/components/schemas/CommModelList'
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
		@@ -3126,6 +3321,8 @@ components:
		$ref: '#/components/schemas/EP_N22-Multiple'
		EP_N31:
		$ref: '#/components/schemas/EP_N31-Multiple'
		EP_N34:
		$ref: '#/components/schemas/EP_N34-Multiple'
		SmsfFunction-Single:
		allOf:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
		@@ -3264,6 +3461,9 @@ components:
		properties:
		EP_NL3:
		$ref: '#/components/schemas/EP_NL3-Multiple'
		EP_N34:
		$ref: '#/components/schemas/EP_N34-Multiple'
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'

		ScpFunction-Single:
		allOf:
		@@ -3282,6 +3482,10 @@ components:
		scpInfo:
		$ref: '#/components/schemas/ScpInfo'
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
		- type: object
		properties:
		EP_SM13:
		$ref: '#/components/schemas/EP_SM13-Multiple'
		NefFunction-Single:
		allOf:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
		@@ -3840,6 +4044,20 @@ components:
		$ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress'
		remoteAddress:
		$ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress'
		EP_N34-Single:
		allOf:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
		- type: object
		properties:
		attributes:
		allOf:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr'
		- type: object
		properties:
		localAddress:
		$ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress'
		remoteAddress:
		$ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress'
		EP_S5C-Single:
		allOf:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
		@@ -4092,7 +4310,8 @@ components:
		type: string
		enum:
		- GBR
		- NonGBR
		- NON_GBR
		- DELAY_CRITICAL_GBR
		priorityLevel:
		type: integer
		packetDelayBudget:
		@@ -4789,6 +5008,34 @@ components:
		EP_Nmb9:
		$ref: '#/components/schemas/EP_Nmb9-Multiple'

		MnpfFunction-Single:
		allOf:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
		- type: object
		properties:
		attributes:
		allOf:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr'
		- type: object
		properties:
		pLMNInfoList:
		$ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList'
		managedNFProfile:
		$ref: '#/components/schemas/ManagedNFProfile'
		commModelList:
		$ref: '#/components/schemas/CommModelList'
		mnpfInfo:
		$ref: '#/components/schemas/MnpfInfo'
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
		- type: object
		properties:
		EP_SM12:
		$ref: '#/components/schemas/EP_SM12-Multiple'
		EP_SM13:
		$ref: '#/components/schemas/EP_SM13-Multiple'
		EP_SM14:
		$ref: '#/components/schemas/EP_SM14-Multiple'

		EP_N3mb-Single:
		allOf:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
		@@ -4845,6 +5092,48 @@ components:
		$ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress'
		remoteAddress:
		$ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress'
		EP_SM12-Single:
		allOf:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
		- type: object
		properties:
		attributes:
		allOf:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr'
		- type: object
		properties:
		localAddress:
		$ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress'
		remoteAddress:
		$ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress'
		EP_SM13-Single:
		allOf:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
		- type: object
		properties:
		attributes:
		allOf:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr'
		- type: object
		properties:
		localAddress:
		$ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress'
		remoteAddress:
		$ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress'
		EP_SM14-Single:
		allOf:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
		- type: object
		properties:
		attributes:
		allOf:
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr'
		- type: object
		properties:
		localAddress:
		$ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress'
		remoteAddress:
		$ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress'

		#-------- Definition of JSON arrays for name-contained IOCs ----------------------

		@@ -5068,6 +5357,10 @@ components:
		type: array
		items:
		$ref: '#/components/schemas/EP_N33-Single'
		EP_N34-Multiple:
		type: array
		items:
		$ref: '#/components/schemas/EP_N34-Single'
		EP_N40-Multiple:
		type: array
		items:
		@@ -5209,6 +5502,18 @@ components:
		type: array
		items:
		$ref: '#/components/schemas/EP_Nmb9-Single'
		EP_SM12-Multiple:
		type: array
		items:
		$ref: '#/components/schemas/EP_SM12-Single'
		EP_SM13-Multiple:
		type: array
		items:
		$ref: '#/components/schemas/EP_SM13-Single'
		EP_SM14-Multiple:
		type: array
		items:
		$ref: '#/components/schemas/EP_SM14-Single'
		Configurable5QISet-Multiple:
		type: array
		items:
		@@ -5273,6 +5578,10 @@ components:
		type: array
		items:
		$ref: '#/components/schemas/MbUpfFunction-Single'
		MnpfFunction-Multiple:
		type: array
		items:
		$ref: '#/components/schemas/MnpfFunction-Single'

		#------------ Definitions in TS 28.541 for TS 28.532 -----------------------------

		@@ -5340,6 +5649,7 @@ components:
		- $ref: '#/components/schemas/EP_N31-Single'
		- $ref: '#/components/schemas/EP_N32-Single'
		- $ref: '#/components/schemas/EP_N33-Single'
		- $ref: '#/components/schemas/EP_N34-Single'
		- $ref: '#/components/schemas/EP_N40-Single'
		- $ref: '#/components/schemas/EP_N41-Single'
		- $ref: '#/components/schemas/EP_N42-Single'
		@@ -5382,6 +5692,10 @@ components:
		- $ref: '#/components/schemas/EP_N16mb-Single'
		- $ref: '#/components/schemas/EP_Nmb1-Single'

		- $ref: '#/components/schemas/EP_SM12-Single'
		- $ref: '#/components/schemas/EP_SM13-Single'
		- $ref: '#/components/schemas/EP_SM14-Single'

		- $ref: '#/components/schemas/Configurable5QISet-Single'
		- $ref: '#/components/schemas/FiveQiDscpMappingSet-Single'
		- $ref: '#/components/schemas/PredefinedPccRuleSet-Single'
		@@ -5399,3 +5713,4 @@ components:
		- $ref: '#/components/schemas/BsfFunction-Single'
		- $ref: '#/components/schemas/MbSmfFunction-Single'
		- $ref: '#/components/schemas/MbUpfFunction-Single'
		- $ref: '#/components/schemas/MnpfFunction-Single'

OpenAPI/TS28541_NrNrm.yaml

+0 −1

Original line number	Diff line number	Diff line
		@@ -1514,7 +1514,6 @@ components:
		$ref: "#/components/schemas/UeAccProbabilityDist"
		ueAccDelayProbabilityDist:
		$ref: "#/components/schemas/UeAccDelayProbabilityDist"
		- $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'

		DMROFunction-Single:
		allOf: