Merge branch... (b6b3796f) · Commits · Miguel Angel Reina Ortega / Management and Orchestration APIs

OpenAPI/5gcNrm.yaml

+76 −12

Original line number	Diff line number	Diff line
		@@ -563,6 +563,36 @@ components:
		items:
		type: string

		DnnSmfInfoItem:
		type: object
		properties:
		dnn:
		type: string
		dnaiList:
		type: array
		items:
		type: string

		SNssaiSmfInfoItem:
		type: object
		properties:
		sNSSAI:
		$ref: 'nrNrm.yaml#/components/schemas/Snssai'
		dnnSmfInfoList:
		type: array
		items:
		$ref: '#/components/schemas/DnnSmfInfoItem'

		IpAddr:
		type: object
		properties:
		ipv4Addr:
		type: string
		ipv6Addr:
		type: string
		ipv6Prefix:
		type: string

		#-------- Definition of concrete IOCs --------------------------------------------

		SubNetwork-Single:
		@@ -766,14 +796,42 @@ components:
		- $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
		- type: object
		properties:
		plmnIdList:
		$ref: 'nrNrm.yaml#/components/schemas/PlmnIdList'
		pLMNInfoList:
		$ref: 'nrNrm.yaml#/components/schemas/PlmnInfoList'
		nRTACList:
		$ref: '#/components/schemas/TACList'
		sBIFqdn:
		type: string
		snssaiList:
		$ref: 'nrNrm.yaml#/components/schemas/SnssaiList'
		sNssaiSmfInfoList:
		type: array
		items:
		$ref: '#/components/schemas/SNssaiSmfInfoItem'
		taiList:
		type: array
		items:
		$ref: 'nrNrm.yaml#/components/schemas/Tai'
		taiRangeList:
		type: array
		items:
		$ref: 'nrNrm.yaml#/components/schemas/TaiRange'
		pwgFqdn:
		type: string
		pgwAddrList:
		type: array
		items:
		$ref: '#/components/schemas/IpAddr'
		accessType:
		$ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/AccessType'
		priority:
		type: integer
		cNSIIdList:
		$ref: '#/components/schemas/CNSIIdList'
		vsmfSupportInd:
		type: boolean
		pwgFqdnList:
		type: array
		items:
		type: string
		managedNFProfile:
		$ref: '#/components/schemas/ManagedNFProfile'
		commModelList:
		@@ -1248,7 +1306,7 @@ components:

		DDNMFFunction-Single:
		allOf:
		- $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
		- $ref: 'genericNrm.yaml#/components/schemas/Top'
		- type: object
		properties:
		attributes:
		@@ -1696,7 +1754,7 @@ components:
		type: boolean
		EP_N33-Single:
		allOf:
		- $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
		- $ref: 'genericNrm.yaml#/components/schemas/Top'
		- type: object
		properties:
		attributes:
		@@ -1809,7 +1867,7 @@ components:
		$ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
		EP_Npc4-Single:
		allOf:
		- $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
		- $ref: 'genericNrm.yaml#/components/schemas/Top'
		- type: object
		properties:
		attributes:
		@@ -1823,7 +1881,7 @@ components:
		$ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
		EP_Npc6-Single:
		allOf:
		- $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
		- $ref: 'genericNrm.yaml#/components/schemas/Top'
		- type: object
		properties:
		attributes:
		@@ -1837,7 +1895,7 @@ components:
		$ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
		EP_Npc7-Single:
		allOf:
		- $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
		- $ref: 'genericNrm.yaml#/components/schemas/Top'
		- type: object
		properties:
		attributes:
		@@ -1851,7 +1909,7 @@ components:
		$ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
		EP_Npc8-Single:
		allOf:
		- $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
		- $ref: 'genericNrm.yaml#/components/schemas/Top'
		- type: object
		properties:
		attributes:
		@@ -1895,7 +1953,7 @@ components:

		FiveQICharacteristics-Single:
		allOf:
		- $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
		- $ref: 'genericNrm.yaml#/components/schemas/Top'
		- type: object
		properties:
		fiveQIValue:
		@@ -2332,6 +2390,7 @@ components:
		- $ref: '#/components/schemas/ScpFunction-Single'
		- $ref: '#/components/schemas/NefFunction-Single'
		- $ref: '#/components/schemas/NsacfFunction-Single'
		- $ref: '#/components/schemas/DDNMFFunction-Single'

		- $ref: '#/components/schemas/ExternalAmfFunction-Single'
		- $ref: '#/components/schemas/ExternalNrfFunction-Single'
		@@ -2373,6 +2432,11 @@ components:
		- $ref: '#/components/schemas/EP_N60-Single'
		- $ref: '#/components/schemas/EP_Nxx-Single'

		- $ref: '#/components/schemas/EP_Npc4-Single'
		- $ref: '#/components/schemas/EP_Npc6-Single'
		- $ref: '#/components/schemas/EP_Npc7-Single'
		- $ref: '#/components/schemas/EP_Npc8-Single'

		- $ref: '#/components/schemas/EP_S5C-Single'
		- $ref: '#/components/schemas/EP_S5U-Single'
		- $ref: '#/components/schemas/EP_Rx-Single'

OpenAPI/genericNrm.yaml

+8 −0

Original line number	Diff line number	Diff line
		@@ -729,6 +729,10 @@ components:
		- NO_IDENTITY
		- TAC_OF_IMEI

		tjMDTBeamLevelMeasurement-Type:
		description: Determines whether beam level measurements shall be included in case of immediate MDT M1 measurement in NR. For additional details see 3GPP TS 32.422 clause 5.10.40.
		type: boolean

		tjMDTCollectionPeriodRrmLte-Type:
		description: See details in 3GPP TS 32.422 clause 5.10.20.
		type: string
		@@ -1351,6 +1355,8 @@ components:
		$ref: '#/components/schemas/tjTraceReference-Type'
		tjTraceRecordSessionReference:
		type: string
		jobId:
		type: string
		tjTraceReportingFormat:
		$ref: '#/components/schemas/tjTraceReportingFormat-Type'
		tjTraceTarget:
		@@ -1365,6 +1371,8 @@ components:
		type: array
		items:
		$ref: '#/components/schemas/AreaScope'
		tjMDTBeamLevelMeasurement:
		$ref: '#/components/schemas/tjMDTBeamLevelMeasurement-Type'
		tjMDTCollectionPeriodRrmLte:
		$ref: '#/components/schemas/tjMDTCollectionPeriodRrmLte-Type'
		tjMDTCollectionPeriodM6Lte:

OpenAPI/intentNrm.yaml

0 → 100644

+383 −0

Original line number	Diff line number	Diff line
		openapi: 3.0.2
		info:
		title: Intent NRM
		description: OAS 3.0.1 specification of the Intent NRM
		version: 17.0.0
		paths: {}
		components:
		schemas:

		Intent-Single:
		allOf:
		- $ref: 'genericNrm.yaml#/components/schemas/Top'
		- type: object
		properties:
		userLabel:
		type: string
		intentExpectations:
		type: array
		items:
		$ref: "#/components/schemas/IntentExpectation"
		intentContexts:
		type: array
		items:
		$ref: "#/components/schemas/IntentContext"
		intentFulfilStatus:
		$ref: "#/components/schemas/IntentFulfilStatus"
		IntentExpectation:
		type: object
		properties:
		expectationId:
		type: string
		expectationObjects:
		type: array
		items:
		$ref: "#/components/schemas/ExpectationObject"
		expectationTargets:
		type: array
		items:
		$ref: "#/components/schemas/ExpectationTarget"
		expectationContexts:
		type: array
		items:
		$ref: "#/components/schemas/ExpectationContext"

		ExpectationObject:
		type: object
		properties:
		objectType:
		type: string
		enum:
		- RAN_SubNetwrok #--value for Radio Network Expectation--#
		- TBD #-This will be added based on defined scenario specfic intent expectation-#
		objectInstance:
		$ref: "comDefs.yaml#/components/schemas/Dn"
		objectContexts:
		type: array
		items:
		$ref: "#/components/schemas/ObjectContext"

		ExpectationTarget:
		oneOf:
		#--ExpectationTargets defind for Radio Network Expectation (ObjectType is RAN_SubNetwork)- #
		- $ref: "#/components/schemas/WeakRSRPRatioTarget"
		- $ref: "#/components/schemas/LowSINRRatioTarget"
		- $ref: "#/components/schemas/AveULRANUEThptTarget"
		- $ref: "#/components/schemas/AveDLRANUEThptTarget"
		- $ref: "#/components/schemas/LowULRANUEThptRatioTarget"
		- $ref: "#/components/schemas/LowDLRANUEThptRatioTarget"
		#--ExpectationTargets defind for Radio Network Expectation (ObjectType is RAN_SubNetwork)- #

		#--ExpectationTargets defind for other Scenario specific Expectation-----TBD---------------#
		#--ExpectationTargets defind for other Scenario specific Expectation-----TBD---------------#


		ObjectContext:
		oneOf:
		#--ObjectContext defind for Radio Network Expectation (ObjectType is RAN_SubNetwork)-------#
		- $ref: "#/components/schemas/CoverageAreaPolygonContext"
		- $ref: "#/components/schemas/CoverageTACContext"
		- $ref: "#/components/schemas/PLMNContext"
		- $ref: "#/components/schemas/NRFqBandContext"
		- $ref: "#/components/schemas/RATContext"
		#--ObjectContext defind for Radio Network Expectation (ObjectType is RAN_SubNetwork)------#

		#--ObjectContext defind for other Scenario specific Expectation -----------TBD------------#
		#--ObjectContext defind for other Scenario specific Expectation -----------TBD------------#



		ExpectationContext:
		type: object
		properties:
		contextAttribute:
		type: string
		contextCondition:
		$ref: "#/components/schemas/Condition"
		contextValueRange:
		type: array
		items:
		type: number

		IntentContext:
		type: object
		properties:
		contextAttribute:
		type: string
		contextCondition:
		$ref: "#/components/schemas/Condition"
		contextValueRange:
		type: array
		items:
		type: number
		Condition:
		type: string
		enum:
		- Is_equal_to
		- Is_less_than
		- Is_greater_than
		- Is_within_the_range

		IntentFulfilStatus:
		type: string
		enum:
		- FULFILLED
		- NOT_FULFILLED
		#-------Definition of the concrete ExpectationTarget dataType----------#
		WeakRSRPRatioTarget:
		type: object
		properties:
		targetName:
		type: string
		enum:
		- WeakRSRPRatio
		targetCondition:
		type: string
		enum:
		- Is_less_than
		targetValueRange:
		type: integer
		minimum: 0
		maximum: 100
		targetContexts:
		$ref: "#/components/schemas/WeakRSRPContext"

		WeakRSRPContext:
		type: object
		properties:
		contextAttribute:
		type: string
		enum:
		- WeakRSRPThreshold
		contextCondition:
		type: string
		enum:
		- Is_less_than
		contextValueRange:
		type: number

		LowSINRRatioTarget:
		type: object
		properties:
		targetName:
		type: string
		enum:
		- LowSINRRatio
		targetCondition:
		type: string
		enum:
		- Is_less_than
		targetValueRange:
		type: integer
		minimum: 0
		maximum: 100
		targetContexts:
		$ref: "#/components/schemas/LowSINRContext"

		LowSINRContext:
		type: object
		properties:
		contextAttribute:
		type: string
		enum:
		- LowSINRThreshold
		contextCondition:
		type: string
		enum:
		- Is_less_than
		contextValueRange:
		type: integer

		AveULRANUEThptTarget:
		type: object
		properties:
		targetName:
		type: string
		enum:
		- AveULRANUEThpt
		targetCondition:
		type: string
		enum:
		- Is_greater_than
		targetValueRange:
		type: integer

		AveDLRANUEThptTarget:
		type: object
		properties:
		targetName:
		type: string
		enum:
		- AveDLRANUEThpt
		targetCondition:
		type: string
		enum:
		- Is_greater_than
		targetValueRange:
		type: integer

		LowULRANUEThptRatioTarget:
		type: object
		properties:
		targetName:
		type: string
		enum:
		- LowULRANUEThptRatio
		targetCondition:
		type: string
		enum:
		- Is_less_than
		targetValueRange:
		type: integer
		minimum: 0
		maximum: 100
		targetContexts:
		$ref: "#/components/schemas/LowULRANUEThptContext"

		LowULRANUEThptContext:
		type: object
		properties:
		contextAttribute:
		type: string
		enum:
		- LowULRANUEThptThreshold
		contextCondition:
		type: string
		enum:
		- Is_less_than
		contextValueRange:
		type: number

		LowDLRANUEThptRatioTarget:
		type: object
		properties:
		targetName:
		type: string
		enum:
		- LowDLRANUEThptRatio
		targetCondition:
		type: string
		enum:
		- Is_less_than
		targetValueRange:
		type: integer
		minimum: 0
		maximum: 100
		targetContexts:
		$ref: "#/components/schemas/LowDLRANUEThptContext"

		LowDLRANUEThptContext:
		type: object
		properties:
		contextAttribute:
		type: string
		enum:
		- LowDLRANUEThptThreshold
		contextCondition:
		type: string
		enum:
		- Is_less_than
		contextValueRange:
		type: number
		#-------Definition of the concrete ExpectationTarget dataType----------#

		#-------Definition of the concrete ObjectTarget dataType----------------#
		CoverageAreaPolygonContext:
		type: object
		properties:
		contextAttribute:
		type: string
		enum:
		- CoverageAreaPolygon
		contextCondition:
		type: string
		enum:
		- Is_within_the_range
		contextValueRange:
		type: array
		items:
		$ref: "#/components/schemas/CoverageArea"
		CoverageArea:
		type: string
		CoverageTACContext:
		type: object
		properties:
		contextAttribute:
		type: string
		enum:
		- CoverageAreaTac
		contextCondition:
		type: string
		enum:
		- Is_within_the_range
		contextValueRange:
		type: array
		items:
		$ref: "nrNrm.yaml#/components/schemas/NrTac"

		PLMNContext:
		type: object
		properties:
		contextAttribute:
		type: string
		enum:
		- PLMN
		contextCondition:
		type: string
		enum:
		- Is_within_the_range
		contextValueRange:
		type: array
		items:
		$ref: "nrNrm.yaml#/components/schemas/PlmnId"

		NRFqBandContext:
		type: object
		properties:
		contextAttribute:
		type: string
		enum:
		- NRFqBand
		contextCondition:
		type: string
		enum:
		- Is_within_the_range
		contextValueRange:
		type: array
		items:
		type: string

		RATContext:
		type: object
		properties:
		contextAttribute:
		type: string
		enum:
		- RAT
		contextCondition:
		type: string
		enum:
		- Is_within_the_range
		contextValueRange:
		type: array
		items:
		type: string
		enum:
		- UTRAN
		- EUTRAN
		- NR
		#-------Definition of the concrete ObjectTarget dataType----------------#

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

		Intent-Multiple:
		type: array
		items:
		$ref: '#/components/schemas/Intent-Single'
		#------Definition of JSON arrays for name-contained IOCs --------------#

		#----- Definitions in TS 28.312 for TS 28.532 --------------------------#
		resources-intentNrm:
		oneOf:
		- $ref: '#/components/schemas/Intent-Single'
		#----- Definitions in TS 28.312 for TS 28.532 --------------------------#

OpenAPI/nrNrm.yaml

+2 −0

Original line number	Diff line number	Diff line
		@@ -1022,6 +1022,8 @@ components:
		properties:
		cellLocalId:
		type: integer
		administrativeState:
		$ref: 'comDefs.yaml#/components/schemas/AdministrativeState'
		plmnInfoList:
		$ref: '#/components/schemas/PlmnInfoList'
		nrTac:

OpenAPI/sliceNrm.yaml

+24 −8

Original line number	Diff line number	Diff line
		@@ -232,19 +232,35 @@ components:
		nsName:
		type: string
		EmbbEEPerfReq:
		type: integer
		type: object
		properties:
		kpiType:
		type: string
		enum:
		- NUMOFBITS
		- NUMOFBITS_RANBASED
		req:
		type: number
		UrllcEEPerfReq:
		type: integer
		type: object
		properties:
		kpiType:
		type: string
		enum:
		- INVOFLATENCY
		- NUMOFBITS_MULTIPLIED_INVOFLATENCY
		req:
		type: number
		MIoTEEPerfReq:
		type: object
		properties:
		KpiType:
		kpiType:
		type: string
		enum:
		- MAXREGSUBS
		- MEANACTIVEUES
		Req:
		type: integer
		req:
		type: number
		EEPerfReq:
		oneOf:
		- $ref: '#/components/schemas/EmbbEEPerfReq'
		@@ -321,7 +337,7 @@ components:
		reliability:
		type: string
		energyEfficiency:
		type: integer
		type: number
		dLDeterministicComm:
		$ref: '#/components/schemas/DeterministicComm'
		uLDeterministicComm:
		@@ -372,7 +388,7 @@ components:
		sliceSimultaneousUse:
		$ref: '#/components/schemas/SliceSimultaneousUse'
		energyEfficiency:
		type: integer
		type: number
		termDensity:
		$ref: '#/components/schemas/TermDensity'
		survivalTime:
		@@ -411,7 +427,7 @@ components:
		sliceSimultaneousUse:
		$ref: '#/components/schemas/SliceSimultaneousUse'
		energyEfficiency:
		type: integer
		$ref: '#/components/schemas/EnergyEfficiency'
		synchronicity:
		$ref: '#/components/schemas/Synchronicity'
		delayTolerance: