diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index c229cc7d83a8e88075b1297a3beca6855b6a42f1..384d36a9af75e5aca62551de30cd14443043e180 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: MDA NRM - version: 18.4.0 + version: 19.0.0 description: >- OAS 3.0.1 specification of the MDA NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -14,14 +14,35 @@ components: schemas: #-------- Definition of types----------------------------------------------------- + MDAType: + type: string + enum: + - COVERAGEANALYTICS_COVERAGEPROBLEMANALYSIS + - COVERAGEANALYTICS_PAGINGOPTIMIZATION + - SLSANALYSIS_SERVICEEXPERIENCEANALYSIS + - SLSANALYSIS_NETWORKSLICETHROUGHPUTANALYSIS + - SLSANALYSIS_NETWORKSLICETRAFFICANALYSIS + - SLSANALYSIS_E2ELATENCYANALYSIS + - SLSANALYSIS_NETWORKSLICELOADANALYSIS + - MDAASSISTEDFAULTMANAGEMENT_FAILUREPREDICTION + - MDAASSISTEDENERGYSAVING_ENERGYSAVINGANALYSIS + - MOBILITYMANAGEMENTANALYTICS_MOBILITYPERFORMANCEANALYSIS + - MOBILITYMANAGEMENTANALYTICS_HANDOVEROPTIMIZATION + - MAINTENANCE_MAINTENANCEANALYTICS + - RESOURCEANALYTICS_VIRTUALIZEDRESOURCEUTILIZATIONANALYSISNF + - RESOURCEANALYTICS_PHYISCALRESOURCEUTILIZATIONANALYSISNF + - RESOURCEANALYTICS_5GCCONTROLPLANECONGESTIONANALYSIS + - PREDICTIONS_PMDATA MDATypes: type: array + uniqueItems: true items: - type: string + $ref: '#/components/schemas/MDAType' MDAOutputs: type: array + uniqueItems: true items: $ref: '#/components/schemas/MDAOutputPerMDAType' @@ -34,7 +55,9 @@ components: - type: object properties: areaScope: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' MDAOutputPerMDAType: @@ -44,6 +67,7 @@ components: type: string mDAOutputIEFilters: type: array + uniqueItems: true items: $ref: '#/components/schemas/MDAOutputIEFilter' @@ -55,7 +79,9 @@ components: filterValue: type: string threshold: - $ref: '#/components/schemas/ThresholdInfo' + type: array + items: + $ref: '#/components/schemas/ThresholdInfo' analyticsPeriod: $ref: '#/components/schemas/AnalyticsSchedule' timeOut: @@ -77,8 +103,9 @@ components: properties: timeDurations: type: array + uniqueItems: true items: - $ref: 'TS28104_MdaReport.yaml#/components/schemas/TimeWindow' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' - type: object properties: granularityPeriod: @@ -107,6 +134,7 @@ components: format: float minimum: 0 + #-------- Definition of types for name-containments ------ SubNetwork-ncO-MdaNrm: type: object @@ -138,15 +166,17 @@ components: properties: supportedMDACapabilities: $ref: '#/components/schemas/MDATypes' - mlModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - aIMLInferenceFunctionRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + mLModelRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' + aIMLInferenceFunctionRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: MDARequest: $ref: '#/components/schemas/MDARequest-Multiple' + MDAReport: + $ref: '#/components/schemas/MDAReport-Multiple' MDARequest-Single: allOf: diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index b57be4d1a8e53fd04bfad327601642a4218f4884..dae638adfbf48990881b7673d01b8cde3c4455ad 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: MDA Report - version: 18.3.0 + version: 19.0.0 description: >- OAS 3.0.1 specification of the MDA Report © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -20,12 +20,14 @@ components: properties: mDAType: type: string + readOnly: true mDAOutputList: type: array + uniqueItems: true items: $ref: '#/components/schemas/MDAOutputEntry' analyticsWindow: - $ref: '#/components/schemas/TimeWindow' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindowRo' confidenceDegree: type: number format: float @@ -35,18 +37,10 @@ components: properties: mDAOutputIEName: type: string + readOnly: true mDAOutputIEValue: {} - TimeWindow: - type: object - properties: - mDAOutputStartTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - mDAOutputEndTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - - #-------- Definition of MDA Report -------------------------------------------- MDAReport: @@ -61,6 +55,8 @@ components: mDAReportID: type: string mDAOutputs: - $ref: '#/components/schemas/MDAOutputs' + type: array + items: + $ref: '#/components/schemas/MDAOutputs' mDARequestRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 7566d90a21594f143cf809d49baa0f4239ab2235..874220189164072aba4cd5d94dd4183a6c9605ae 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: AI/ML NRM - version: 18.4.0 + version: 19.1.0 description: >- OAS 3.0.1 specification of the AI/ML NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -18,13 +18,14 @@ components: MLContext: type: object properties: - inferenceModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + inferenceEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' dataProviderRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' RequestStatus: type: string + readOnly: true enum: - NOT_STARTED - IN_PROGRESS @@ -69,6 +70,7 @@ components: properties: thresholdList: type: array + uniqueItems: true items: $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdInfo' managedActivationScope: @@ -80,10 +82,15 @@ components: properties: performanceIndicatorName: type: string + readOnly: true isSupportedForTraining: type: boolean + readOnly: true + default: FALSE isSupportedForTesting: type: boolean + readOnly: true + default: FALSE ManagedActivationScope: oneOf: @@ -91,18 +98,21 @@ components: properties: dNList: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - type: object properties: timeWindow: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' - type: object properties: geoPolygon: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' @@ -110,9 +120,10 @@ components: type: object properties: aIMLInferenceName: - type: string + $ref: '#/components/schemas/AIMLInferenceName' capabilityName: type: string + readOnly: true mLCapabilityParameters: description: A map (list of key-value pairs) for an aIMLInferenceName and capabilityName $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' @@ -122,36 +133,60 @@ components: properties: availMLCapabilityReportID: type: string + readOnly: true mLCapabilityVersionId: type: array + uniqueItems: true items: type: string + readOnly: true expectedPerformanceGains: type: array + uniqueItems: true items: $ref: '#/components/schemas/ModelPerformance' mLModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' InferenceOutput: type: object properties: inferenceOutputId: type: array + uniqueItems: true items: type: string + readOnly: true aIMLInferenceName: - type: string + $ref: '#/components/schemas/AIMLInferenceName' + readOnly: true inferenceOutputTime: type: array + uniqueItems: true items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' # FIXME, isOrder/isUnique both as True inferencePerformance: $ref: '#/components/schemas/ModelPerformance' outputResult: description: A map (list of key-value pairs) for Inference result name and it's value $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' + AIMLInferenceName: + oneOf: + - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/MDAType' + - $ref: '#/components/schemas/NwdafAnalyticsType' + - $ref: '#/components/schemas/NgRanInferenceType' + - $ref: '#/components/schemas/VSExtensionType' + NwdafAnalyticsType: + $ref: 'TS29520_Nnwdaf_EventsSubscription.yaml#/components/schemas/NwdafEvent' + NgRanInferenceType: + type: string + enum: + - NG_RAN_NETWORK_ENERGY_SAVING + - NG_RAN_LOAD_BALANCING + - NG_RAN_ MOBILITY_OPTIMIZATION + VSExtensionType: + type: string #-------- Definition of types for name-containments ------ SubNetwork-ncO-AiMlNrm: @@ -199,7 +234,7 @@ components: - type: object properties: mLModelRepositoryRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -226,21 +261,25 @@ components: - type: object properties: aIMLInferenceName: - type: string + $ref: '#/components/schemas/AIMLInferenceName' candidateTrainingDataSource: type: array + uniqueItems: true items: type: string trainingDataQualityScore: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' trainingRequestSource: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + oneOf: + - type: string + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' requestStatus: $ref: '#/components/schemas/RequestStatus' expectedRuntimeContext: $ref: '#/components/schemas/MLContext' performanceRequirements: type: array + uniqueItems: true items: $ref: '#/components/schemas/ModelPerformance' cancelRequest: @@ -248,9 +287,9 @@ components: suspendRequest: type: boolean mLModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' mLModelCoordinationGroupRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' MLTrainingProcess-Single: allOf: @@ -263,22 +302,25 @@ components: properties: priority: type: integer + default: 0 terminationConditions: type: string progressStatus: $ref: '#/components/schemas/ProcessMonitor' cancelProcess: type: boolean + default: FALSE suspendProcess: type: boolean + default: FALSE trainingRequestRef: ## Figure 7.3a.1.1.1-1 has no such pointer - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' trainingReportRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' mLModelGeneratedRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' mLModelRef: ## Figure 7.3a.1.1.1-1 is 1-0..1 mapping, hence should be single - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' MLTrainingReport-Single: allOf: @@ -291,34 +333,40 @@ components: properties: usedConsumerTrainingData: type: array + uniqueItems: true items: type: string + readOnly: true modelConfidenceIndication: type: integer + readOnly: true modelPerformanceTraining: type: array + uniqueItems: true items: $ref: '#/components/schemas/ModelPerformance' modelPerformanceValidation: type: array + uniqueItems: true items: $ref: '#/components/schemas/ModelPerformance' dataRatioTrainingAndValidation: type: integer areNewTrainingDataUsed: type: boolean + readOnly: true trainingRequestRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' trainingProcessRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' lastTrainingRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' mLModelGeneratedRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' mLModelCoordinationGroupGeneratedRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' mLModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' MLTestingFunction-Single: allOf: @@ -331,7 +379,7 @@ components: - type: object properties: ##FIXME pointer to MLModelCoordinationGroup missing mLModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -348,20 +396,19 @@ components: attributes: allOf: - type: object - oneOf: - - required: [ requestStatus, mLModelToTestRef ] - - required: [ requestStatus, mLModelCoordinationGroupToTestRef ] properties: requestStatus: $ref: '#/components/schemas/RequestStatus' cancelRequest: type: boolean + default: FALSE suspendRequest: - type: boolean - mLModelToTestRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - mLModelCoordinationGroupToTestRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + type: boolean + default: FALSE + mLModelRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' + mLModelCoordinationGroupRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' MLTestingReport-Single: allOf: @@ -374,12 +421,14 @@ components: properties: modelPerformanceTesting: type: array + uniqueItems: true items: $ref: '#/components/schemas/ModelPerformance' mLTestingResult: type: string + readOnly: true testingRequestRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' MLModelLoadingRequest-Single: allOf: @@ -394,10 +443,12 @@ components: $ref: '#/components/schemas/RequestStatus' cancelRequest: type: boolean + default: FALSE suspendRequest: - type: boolean + type: boolean + default: FALSE mLModelToLoadRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' MLModelLoadingPolicy-Single: allOf: @@ -409,11 +460,11 @@ components: - type: object properties: aIMLInferenceName: - type: string + $ref: '#/components/schemas/AIMLInferenceName' policyForLoading: $ref: '#/components/schemas/AIMLManagementPolicy' mLModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' MLModelLoadingProcess-Single: allOf: @@ -428,14 +479,16 @@ components: $ref: '#/components/schemas/ProcessMonitor' cancelProcess: type: boolean + default: FALSE suspendProcess: type: boolean + default: FALSE mLModelLoadingRequestRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' mLModelLoadingPolicyRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' loadedMLModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' MLModel-Single: allOf: @@ -447,10 +500,12 @@ components: properties: mLModelId: type: string + readOnly: true aIMLInferenceName: - type: string + $ref: '#/components/schemas/AIMLInferenceName' mLModelVersion: type: string + readOnly: true expectedRunTimeContext: $ref: '#/components/schemas/MLContext' trainingContext: @@ -458,15 +513,25 @@ components: runTimeContext: $ref: '#/components/schemas/MLContext' supportedPerformanceIndicators: - $ref: '#/components/schemas/SupportedPerfIndicator' + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/SupportedPerfIndicator' + minItems: 1 mLCapabilitiesInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/MLCapabilityInfo' + minItems: 1 retrainingEventsMonitorRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' sourceTrainedMLModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' + aIMLInferenceReportRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' + usedByFunctionRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' MLModelRepository-Single: allOf: @@ -487,7 +552,11 @@ components: type: object properties: memberMLModelRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' + minItems: 2 ## 7.3a.4.1 IOC MLUpdateFunction-Single: @@ -503,7 +572,7 @@ components: availMLCapabilityReport: $ref: '#/components/schemas/AvailMLCapabilityReport' mLModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -524,10 +593,12 @@ components: properties: performanceGainThreshold: type: array + uniqueItems: true items: $ref: '#/components/schemas/ModelPerformance' newCapabilityVersionId: type: array + uniqueItems: true items: type: string updateTimeDeadline: @@ -538,12 +609,14 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' cancelRequest: type: boolean + default: FALSE suspendRequest: type: boolean + default: FALSE mLUpdateProcessRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - mLModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' + mLModelRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' MLUpdateProcess-Single: allOf: @@ -555,12 +628,18 @@ components: properties: progressStatus: $ref: '#/components/schemas/ProcessMonitor' - mLModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - mLUpdateRequestRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + cancelProcess: + type: boolean + default: FALSE + suspendProcess: + type: boolean + default: FALSE + mLModelRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' + mLUpdateRequestRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' mLUpdateReportRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' MLUpdateReport-Single: allOf: @@ -572,10 +651,10 @@ components: properties: updatedMLCapability: $ref: '#/components/schemas/AvailMLCapabilityReport' - mLModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + mLModelRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' mLUpdateProcessRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' AIMLInferenceFunction-Single: allOf: @@ -595,9 +674,9 @@ components: managedActivationScope: $ref: '#/components/schemas/AIMLManagementPolicy' usedByFunctionRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - mLModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' + mLModelRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -623,11 +702,12 @@ components: properties: inferenceOutputs: type: array + uniqueItems: true items: $ref: '#/components/schemas/InferenceOutput' minItems: 1 - mLModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + mLModelRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' AIMLInferenceEmulationFunction-Single: allOf: @@ -639,7 +719,7 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - type: object properties: - AIMLInferenceEmulationReport: + AIMLInferenceReport: $ref: '#/components/schemas/AIMLInferenceReport-Multiple' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' diff --git a/OpenAPI/TS28111_FaultNrm.yaml b/OpenAPI/TS28111_FaultNrm.yaml index 7a525d13f635f975e14c2f0b5dd108cae8f18e59..321b34cc51b20222e7b5545ea65dea821d6ca805 100644 --- a/OpenAPI/TS28111_FaultNrm.yaml +++ b/OpenAPI/TS28111_FaultNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Fault Management NRM - version: 18.1.0 + version: 19.0.0 description: >- OAS 3.0.1 definition of the Fault Supervision MnS © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -40,6 +40,7 @@ components: - PHYSICAL_VIOLATION - SECURITY_SERVICE_OR_MECHANISM_VIOLATION - TIME_DOMAIN_VIOLATION + readOnly: true ProbableCause: description: >- The value of the probable cause may be a specific standardized string, or any @@ -58,12 +59,17 @@ components: - PROBABLE_CAUSE_003 - PROBABLE_CAUSE_004 - PROBABLE_CAUSE_005 + readOnly: true - type: string + readOnly: true - type: integer + readOnly: true SpecificProblem: oneOf: - type: string + readOnly: true - type: integer + readOnly: true PerceivedSeverity: type: string enum: @@ -72,9 +78,10 @@ components: - MAJOR - MINOR - WARNING - - CLEARED + - CLEARED TrendIndication: type: string + readOnly: true enum: - MORE_SEVERE - NO_CHANGE @@ -87,9 +94,9 @@ components: high: oneOf: - type: integer - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/FloatRo' low: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/FloatRo' ThresholdLevelInd: oneOf: - type: object @@ -105,12 +112,14 @@ components: properties: observedMeasurement: type: string + readOnly: true observedValue: type: number + readOnly: true thresholdLevel: $ref: '#/components/schemas/ThresholdLevelInd' armTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' required: - observedMeasurement - observedValue @@ -118,7 +127,7 @@ components: type: object properties: sourceObjectInstance: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' notificationIds: type: array items: @@ -145,15 +154,15 @@ components: # alarmId: # $ref: '#/components/schemas/AlarmId' objectInstance: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' notificationId: $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationId' alarmRaisedTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' alarmChangedTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' alarmClearedTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' alarmType: $ref: '#/components/schemas/AlarmType' probableCause: @@ -165,7 +174,7 @@ components: backedUpStatus: type: boolean backUpObject: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' trendIndication: $ref: '#/components/schemas/TrendIndication' thresholdinfo: @@ -178,34 +187,36 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' proposedRepairActions: type: string + readOnly: true additionalText: type: string + readOnly: true additionalInformation: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' - rootCauseIndicator: type: boolean - + readOnly: true ackTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' ackUserId: type: string ackSystemId: type: string ackState: $ref: '#/components/schemas/AckState' - clearUserId: type: string clearSystemId: type: string serviceUser: type: string + readOnly: true serviceProvider: type: string + readOnly: true securityAlarmDetector: type: string - + readOnly: true AlarmList-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -220,8 +231,9 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' numOfAlarmRecords: type: integer + readOnly: true lastModification: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' alarmRecords: description: >- This resource represents a map of alarm records. @@ -230,7 +242,7 @@ components: additionalProperties: $ref: '#/components/schemas/AlarmRecord' unreliableAlarmScope: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' #---- Definition of alarm notifications --------------------------------------------# @@ -539,7 +551,7 @@ components: type: object properties: commentTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' commentUserId: type: string commentSystemId: diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 82031387f92e7b5a1a985d4a895bb530b3aed843..e1d2bb5f6574691fd3f3a8ff407671cf7fd4ffd6 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Scenario specific Intent Expectations - version: 18.4.0 + version: 19.0.0 description: >- OAS 3.0.1 definition of scenario specific Intent Expectations © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -27,6 +27,7 @@ components: $ref: "#/components/schemas/RadioNetworkExpectationObject" expectationTargets: type: array + uniqueItems: true items: type: object oneOf: @@ -45,6 +46,7 @@ components: - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget' expectationContexts: type: array + uniqueItems: true items: type: object oneOf: @@ -65,6 +67,7 @@ components: $ref: "#/components/schemas/RadioServiceExpectationObject" expectationTargets: type: array + uniqueItems: true items: type: object oneOf: @@ -75,6 +78,7 @@ components: - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget' expectationContexts: type: array + uniqueItems: true items: $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context' required: @@ -92,6 +96,7 @@ components: $ref: '#/components/schemas/EdgeServiceSupportExpectationObject' expectationTargets: type: array + uniqueItems: true items: type: object oneOf: @@ -105,6 +110,7 @@ components: - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget' expectationContexts: type: array + uniqueItems: true items: type: object oneOf: @@ -126,10 +132,12 @@ components: $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb" expectationObjects: type: array + uniqueItems: true items: $ref: "#/components/schemas/5GCNetworkExpectationObject" expectationTargets: type: array + uniqueItems: true items: type: object oneOf: @@ -140,6 +148,7 @@ components: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget" expectationContexts: type: array + uniqueItems: true items: type: object oneOf: @@ -164,6 +173,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: type: array + uniqueItems: true items: type: object oneOf: @@ -188,6 +198,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: type: array + uniqueItems: true items: type: object oneOf: @@ -207,6 +218,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: type: array + uniqueItems: true items: type: object oneOf: @@ -227,6 +239,7 @@ components: $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" objectContexts: type: array + uniqueItems: true items: type: object oneOf: @@ -812,6 +825,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: $ref: "TS28623_ComDefs.yaml#/components/schemas/Tac" PLMNContext: @@ -829,6 +843,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' DlFrequencyContext: @@ -847,6 +862,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Frequency' UlFrequencyContext: @@ -865,6 +881,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Frequency' RATContext: @@ -883,6 +900,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: type: string enum: @@ -904,6 +922,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: $ref: "TS28312_IntentNrm.yaml#/components/schemas/UEGroup" EdgeIdentificationIdContext: @@ -951,6 +970,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: $ref: "TS28623_ComDefs.yaml#/components/schemas/Tac" NfTypeContext: @@ -968,8 +988,9 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: - $ref: "TS28623_GenericNrm.yaml#/components/schemas/NFType" + $ref: "TS28541_5GcNrm.yaml#/components/schemas/NFType" NfInstanceLocationContext: description: >- This data type is the "ObjectContext" data type with specialisations for NfInstanceLocationContext @@ -985,6 +1006,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: type: string TaiContext: @@ -1002,6 +1024,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: $ref: "TS28623_GenericNrm.yaml#/components/schemas/Tai" ServingScopeContext: @@ -1019,6 +1042,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: type: string DnnContext: @@ -1036,6 +1060,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: type: string #-------Definition of the scenario specific ObjectTarget dataType----------------# diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index dc5c4d4e48ca9d7641779bc7bd27ebe49288c5ec..248eac3dc1ef7cc975ca89c7a8796e83a58ca06e 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Intent NRM - version: 18.4.0 + version: 19.0.0 description: >- OAS 3.0.1 definition of the Intent NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -33,6 +33,8 @@ components: type: string intentExpectations: type: array + uniqueItems: true + minItems: 1 items: type: object oneOf: @@ -45,6 +47,7 @@ components: $ref: "#/components/schemas/Selectivity" intentContexts: type: array + uniqueItems: true items: $ref: '#/components/schemas/Context' description: >- @@ -64,17 +67,14 @@ components: maximum: 100 description: It expresses the priority of the stated intent within a MnS consumer. intentPreemptionCapability: - type: string - enum: - - TRUE - - FALSE + type: boolean observationPeriod: type: integer description: >- It represents the observation period of the fulfilmentInfo for corresponding ExpectationTargets, IntentExpectations and Intent. intentReportReference: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' IntentReport-Single: description: It represents intent report information from MnS producer to MnS consumer. allOf: @@ -85,14 +85,15 @@ components: $ref: '#/components/schemas/IntentFulfilmentReport' intentConflictReports: type: array + uniqueItems: true items: $ref: '#/components/schemas/IntentConflictReport' intentFeasibilityCheckReport: $ref: '#/components/schemas/IntentFeasibilityCheckReport' lastUpdatedTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' intentReference: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' IntentHandlingFunction-Single: description: >- It represents the intent handling capabilities can be supported by a specific intent @@ -103,6 +104,8 @@ components: properties: intentHandlingCapabilityList: type: array + uniqueItems: true + minItems: 1 items: $ref: '#/components/schemas/IntentHandlingCapability' Intent: @@ -128,12 +131,15 @@ components: $ref: "#/components/schemas/ExpectationObject" expectationTargets: type: array + uniqueItems: true + minItems: 1 items: $ref: '#/components/schemas/ExpectationTarget' contextSelectivity: $ref: "#/components/schemas/Selectivity" expectationContexts: type: array + uniqueItems: true items: $ref: '#/components/schemas/Context' required: @@ -158,6 +164,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: type: array + uniqueItems: true items: $ref: '#/components/schemas/Context' description: >- @@ -219,6 +226,7 @@ components: $ref: "#/components/schemas/NotFulfilledState" notFulfilledReasons: type: array + uniqueItems: true items: type: string readOnly: true @@ -288,6 +296,8 @@ components: targetValueRange: oneOf: - type: array + uniqueItems: true + minItems: 1 items: $ref: "#/components/schemas/ValueRangeType" - $ref: "#/components/schemas/ValueRangeType" @@ -295,6 +305,7 @@ components: $ref: "#/components/schemas/Selectivity" targetContexts: type: array + uniqueItems: true items: $ref: '#/components/schemas/Context' description: It describes the list of constraints and conditions that should apply for a specific expectationTarget. @@ -313,6 +324,8 @@ components: contextValueRange: oneOf: - type: array + uniqueItems: true + minItems: 1 items: $ref: "#/components/schemas/ValueRangeType" - $ref: "#/components/schemas/ValueRangeType" @@ -329,6 +342,8 @@ components: $ref: '#/components/schemas/FulfilmentInfo' expectationFulfilmentResult: type: array + uniqueItems: true + minItems: 1 items: $ref: '#/components/schemas/ExpectationFulfilmentResult' #-------Definition of the concrete IntentFulfilmentReport dataType----------------# @@ -341,10 +356,12 @@ components: properties: expectaitonId: type: string + readOnly: true expectationFulfilmentInfo: $ref: '#/components/schemas/FulfilmentInfo' - targetFulfilmentResult: + targetFulfilmentResults: type: array + uniqueItems: true items: $ref: '#/components/schemas/TargetFulfilmentResult' #-------Definition of the concrete ExpectationFulfilmentResult dataType----------------# @@ -357,6 +374,7 @@ components: properties: targetName: type: string + readOnly: true targetFulfilmentInfo: $ref: '#/components/schemas/FulfilmentInfo' targetAchievedValue: @@ -364,6 +382,7 @@ components: description: >- It describes the value that has been achieved for the expectation target at the time at which the report is generated. + readOnly: true #-------Definition of the concrete TargetFulfilmentResult dataType----------------# #-------Definition of the generic IntentConflictReport dataType----------------# @@ -375,8 +394,10 @@ components: properties: conflictId: type: string + readOnly: true conflictType: type: string + readOnly: true enum: - INTENT_CONFLICT - EXPECTATION_CONFLICT @@ -384,17 +405,20 @@ components: conflictingIntent: description: >- This will be present if the value of conflictType is INTENT_CONFLICT. It describes the DN of the conflicting intent - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' conflictingExpectation: description: >- This will be present if the value of conflictType is EXPECTATION_CONFLICT. It describes the expectationId of the conflicting IntentExpectation with an Intent - type: string + type: string + readOnly: true conflictingTarget: description: >- This will be present if the value of conflictType is TARGET_CONFLICT. It describes the targetName of the conflicting ExpectationTarget with an IntentExpectation - type: string + type: string + readOnly: true recommendedSolutions: - type: string + type: string + readOnly: true enum: - MODIFY - DELETE @@ -410,11 +434,13 @@ components: properties: feasibilityCheckResult: type: string + readOnly: true enum: - FEASIBLE - INFEASIBLE - infeasibilityReason: + infeasibilityReasons: type: string + readOnly: true description: An attribute which is used when feasibilityCheckResult is INFEASIBLE #-------Definition of the concrete IntentFeasibilityCheckReport dataType----------------# @@ -427,6 +453,7 @@ components: properties: intentHandlingCapabilityId: type: string + readOnly: true supportedExpectationObjectType: type: string enum: @@ -434,11 +461,15 @@ components: - EDGE_SERVICE_SUPPORT - 5GC_SUBNETWORK - Radio_Service + readOnly: true description: It describes the expectation object type which can be supported by a specific intent handling function of MnS producer. supportedExpectationTargetNames: type: array + uniqueItems: true + minItems: 1 items: type: string + readOnly: true description: It describes the supported expectation targets for the supported expectation object type. #-------Definition of the concrete IntentHandlingCapability dataType----------------# diff --git a/OpenAPI/TS28317_RanScNrm.yaml b/OpenAPI/TS28317_RanScNrm.yaml index 3b1973463bac5549049ca00a706b4fd418066973..13a85ef1b15e39a2a758ce3721012b1b8f526abd 100644 --- a/OpenAPI/TS28317_RanScNrm.yaml +++ b/OpenAPI/TS28317_RanScNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: RANSC NRM - version: 18.1.0 + version: 19.0.0 description: >- OAS 3.0.1 definition of the RANSC NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -34,6 +34,7 @@ components: properties: nEInformation: type: array + uniqueItems: true items: $ref: '#/components/schemas/NEInfomration' description: >- @@ -64,7 +65,7 @@ components: description: >- Setting this attribute to "TRUE" cancels the self configuration process. scMgmtProfileRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' #-------Definition of IOCs ----------# @@ -100,8 +101,9 @@ components: for usage in the RANSC management for monitoring for the self configuration process. type: object properties: - jobId: + id: type: string + readOnly: true status: type: string enum: @@ -111,10 +113,12 @@ components: - FAILED - CANCELLING - CANCELLED + readOnly: true progressPercentage: type: integer minimum: 0 maximum: 100 + readOnly: true progressStateInfo: type: string enum: @@ -126,9 +130,11 @@ components: - RETRIEVE_CONFIGURATION_DATA - SETUP_PRECONFIGURED_SIGNALLING_LINKS - SET_FINAL_STATE_OF_NE + readOnly: true resultStateInfo: oneOf: - type: string + readOnly: true enum: - UNKNOWN - INCORRECT_CONFIGURATION @@ -136,10 +142,11 @@ components: - DISCONNECTION_BETWEEN_NE_AND_OAM - OTHER - type: string + readOnly: true startTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' endTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' #-------Definition of Data types ----------# diff --git a/OpenAPI/TS28318_DsoNrm.yaml b/OpenAPI/TS28318_DsoNrm.yaml index 7246dca06f5339830621ae57777da15147215f37..06bc702eb4fead3221410144181a49918c3cfbca 100644 --- a/OpenAPI/TS28318_DsoNrm.yaml +++ b/OpenAPI/TS28318_DsoNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP NRM - version: 18.1.0 + version: 19.0.0 description: >- OAS 3.0.1 specification of the OutageAndRecoveryInfo NRM © 2024, 3GPP Organizational OutageAndRecoveryInfo Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -47,11 +47,13 @@ components: dsoRapidInterventionDuration: type: integer mnoInterventionTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' mnoInterventionDuration: type: integer + readOnly: true mnoMaxServiceDuration: type: integer + readOnly: true affectedArea: $ref: '#/components/schemas/EnergyServiceLocation' isAffectedAreaPriority: diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 116dfc4b7d44bcd8df8eafb2f94fadb728a982fa..ce913eb9a874ba4ebf6a211379ac9ff5cb2742c8 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Provisioning MnS - version: 18.3.0 + version: 18.5.0 description: >- OAS 3.0.1 definition of the Provisioning MnS © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -219,7 +219,7 @@ paths: are targeted. required: false schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexConditions' - name: attributes in: query description: >- @@ -251,7 +251,10 @@ paths: select data nodes. required: false schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter' + oneOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionBasic' + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionAdvanced' + responses: '200': description: >- diff --git a/OpenAPI/TS28536_CoslaNrm.yaml b/OpenAPI/TS28536_CoslaNrm.yaml index a81e08261fc6cd845e072718fccae9bdee4553ce..05197c3c7aa4062105db3780ece08c4f8bdaae29 100755 --- a/OpenAPI/TS28536_CoslaNrm.yaml +++ b/OpenAPI/TS28536_CoslaNrm.yaml @@ -2,7 +2,7 @@ openapi: 3.0.1 info: title: coslaNrm - version: 18.1.0 + version: 19.0.0 description: >- OAS 3.0.1 specification of the Cosla NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -33,30 +33,35 @@ components: AssuranceGoalStatusObserved: type: string + readOnly: true enum: - FULFILLED - NOT_FULFILLED AssuranceGoalStatusPredicted: type: string + readOnly: true enum: - FULFILLED - NOT_FULFILLED AssuranceTargetStatusObserved: type: string + readOnly: true enum: - FULFILLED - NOT_FULFILLED AssuranceTargetStatusPredicted: type: string + readOnly: true enum: - FULFILLED - NOT_FULFILLED AssuranceTargetName: type: string + readOnly: true AssuranceTarget: type: object @@ -65,9 +70,12 @@ components: $ref: '#/components/schemas/AssuranceTargetName' assuranceTargetValue: type: string + readOnly: true AssuranceTargetList: type: array + uniqueItems: true + minItems: 1 items: $ref: '#/components/schemas/AssuranceTarget' @@ -76,17 +84,18 @@ components: properties: assuranceGoalStatusId: type: string + readOnly: true assuranceGoalId: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' assuranceGoalStatusObserved: $ref: '#/components/schemas/AssuranceGoalStatusObserved' assuranceGoalStatusPredicted: $ref: '#/components/schemas/AssuranceGoalStatusPredicted' - assuranceGoalRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' AssuranceGoalStatusList: type: array + uniqueItems: true + minItems: 1 items: $ref: '#/components/schemas/AssuranceGoalStatus' @@ -95,6 +104,7 @@ components: properties: assuranceTargetStatusId: type: string + readOnly: true assuranceTargetName: $ref: '#/components/schemas/AssuranceTargetName' assuranceTargetStatusObserved: @@ -104,11 +114,14 @@ components: AssuranceTargetStatusList: type: array + uniqueItems: true + minItems: 1 items: $ref: '#/components/schemas/AssuranceTargetStatus' AttributeNameList: type: array + uniqueItems: true items: type: string @@ -155,13 +168,17 @@ components: controlLoopLifeCyclePhase: $ref: '#/components/schemas/ControlLoopLifeCyclePhase' aCCLDisallowedList: - $ref: '#/components/schemas/ACCLDisallowedAttributes' + type: array + items: + $ref: '#/components/schemas/ACCLDisallowedAttributes' + networkSliceRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + networkSliceSubnetRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + AssuranceReport: + $ref: '#/components/schemas/AssuranceReport-Single' AssuranceGoal: $ref: '#/components/schemas/AssuranceGoal-Multiple' - networkSliceRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - networkSliceSubnetRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' AssuranceGoal-Single: allOf: @@ -194,6 +211,8 @@ components: properties: assuranceGoalStatusList: $ref: '#/components/schemas/AssuranceGoalStatusList' + assuranceGoalRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 0848b77d43bfaeb0f655cfe23151d47ccfde4018..b4fc616cbfc89fd28951ac2c5d99d4a3b4a10458 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP Edge NRM - version: 18.7.0 + version: 19.2.0 description: >- OAS 3.0.1 specification of the Edge NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -88,16 +88,21 @@ components: type: string swImageRef: type: string - Duration: + RegistrationInfo: type: object properties: - startTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - endTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + registrationExpiry: + type: string + readOnly: true + registrationID: + type: string + readOnly: true + secCredential: + type: string EASServicePermission: type: string description: any of enumerated value + readOnly: true enum: - TRIAL - SILVER @@ -107,9 +112,11 @@ components: EASStatus: type: string description: any of enumerated value + readOnly: true enum: - ENABLED - DISABLED + - OVERLOAD_WARNING ResourceReservationRequirement: type: object properties: @@ -125,9 +132,11 @@ components: properties: resourceId: type: string + readOnly: true reservationStatus: type: string description: any of enumrated value + readOnly: true enum: - RESERVED - USEd @@ -142,9 +151,11 @@ components: - FUTURE futuristicTriggerTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - AvailableEDNList: + AvailableEDN: type: object properties: + AvailableEDN: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' resourceQuota: $ref: '#/components/schemas/VirtualResource' FederatedECSInfo: @@ -158,7 +169,26 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' servedEESList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - + SAP: + type: object + properties: + host: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' + port: + type: integer + Operation: + type: object + properties: + name: + type: string + allowedConsumers: + type: string + operationSemantics: + type: string + description: any of enumrated value + enum: + - REQUEST_RESPONSE + - SUBSCRIBE_NOTIFY #-------- Definition of types for name-containments ------ SubNetwork-ncO-EdgeNrm: @@ -168,6 +198,31 @@ components: $ref: '#/components/schemas/ECSFunction-Multiple' EdgeDataNetwork: $ref: '#/components/schemas/EdgeDataNetwork-Multiple' + EASBundle: + $ref: '#/components/schemas/EASBundle-Multiple' + +#-------- Definition of Edge common IOCs -------------------------------------------- + ManagedEdgeNFService-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + userLabel: + type: string + sAP: + $ref: '#/components/schemas/SAP' + operations: + type: array + items: + $ref: '#/components/schemas/Operation' + administrativeState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' + operationalState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' +#-------- Definition of Edge common IOCs -------------------------------------------- #-------- Definition of concrete IOCs -------------------------------------------- @@ -188,6 +243,7 @@ components: $ref: '#/components/schemas/EESFunction-Multiple' availableEdgeVirtualResources: type: string + readOnly: true EASFunction-Single: allOf: @@ -205,6 +261,8 @@ components: type: array items: type: string + registrationInfo: + $ref: '#/components/schemas/RegistrationInfo' eASRequirementsRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' eASAddress: @@ -215,6 +273,7 @@ components: $ref: '#/components/schemas/RelocationTriggerInfo' relocationRejectByASP: type: boolean + default: FALSE - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' EASProfile-Single: allOf: @@ -223,12 +282,15 @@ components: properties: aCID: type: string + readOnly: true eASProvider: type: string + readOnly: true eASdescription: type: string + readOnly: true eASSchedule: - $ref: '#/components/schemas/Duration' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindowRo' eASGeographicalServiceArea: $ref: '#/components/schemas/GeoLoc' eASTopologicalServiceArea: @@ -239,10 +301,14 @@ components: $ref: '#/components/schemas/EASFeature' eASServiceContinuitySupport: type: boolean + readOnly: true + default: FALSE eASDNAI: type: string + readOnly: true eASAvailabilityReportingPeriod: type: integer + readOnly: true eASStatus: $ref: '#/components/schemas/EASStatus' EESFunction-Single: @@ -270,8 +336,14 @@ components: serviceContinuitySupport: type: boolean eASFunctionRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + registrationInfo: + $ref: '#/components/schemas/RegistrationInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + ManagedEdgeNFService: + $ref: '#/components/schemas/ManagedEdgeNFService-Multiple' ECSFunction-Single: allOf: @@ -296,6 +368,10 @@ components: sharedECSInfo: $ref: '#/components/schemas/FederatedECSInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + ManagedEdgeNFService: + $ref: '#/components/schemas/ManagedEdgeNFService-Multiple' EASRequirements-Single: allOf: @@ -313,7 +389,7 @@ components: softwareImageInfo: $ref: '#/components/schemas/SoftwareImageInfo' eASSchedule: - $ref: '#/components/schemas/Duration' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' eASFeature: $ref: '#/components/schemas/EASFeature' relocationPolicy: @@ -369,8 +445,10 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' leadingOPiD: type: string - avaibleEDNList: - $ref: '#/components/schemas/AvailableEDNList' + availableEDNList: + type: array + items: + $ref: '#/components/schemas/AvailableEDN' acceptedEDN: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' OperatorEdgeDataNetwork-Single: @@ -382,7 +460,32 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' edgeDataNetworkRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - + EASBundle-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + bundleIdentifier: + type: string + readOnly: true + bundledEASIdentifier: + type: string + bundleType: + type: string + mainEASIdentifier: + type: string + coordinatedEASDiscovery: + type: boolean + default: FALSE + coordinatedACR: + type: boolean + eDNAffinity: + type: string + description: any of enumrated value + enum: + - STRONG + - WEAK + - PREFERRED #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -418,15 +521,22 @@ components: type: array items: $ref: '#/components/schemas/OperatorEdgeDataNetwork-Single' + EASBundle-Multiple: + type: array + items: + $ref: '#/components/schemas/EASBundle-Single' + ManagedEdgeNFService-Multiple: + type: array + items: + $ref: '#/components/schemas/ManagedEdgeNFService-Single' - #--------------------------------- Definition ------------------------------------ resources-edgeNrm: oneOf: - $ref: '#/components/schemas/EASFunction-Single' - $ref: '#/components/schemas/ECSFunction-Single' - - $ref: '#/components/schemas/EESFunction-Single' + - $ref: '#/components/schemas/EESFunction-Single' - $ref: '#/components/schemas/EdgeDataNetwork-Single' - $ref: '#/components/schemas/EASRequirements-Single' - $ref: '#/components/schemas/EASProfile-Single' @@ -434,3 +544,5 @@ components: - $ref: '#/components/schemas/OperatorEdgeFederation-Single' - $ref: '#/components/schemas/OperatorEdgeDataNetwork-Single' - $ref: '#/components/schemas/EASResourceReservationJob-Single' + - $ref: '#/components/schemas/EASBundle-Single' + - $ref: '#/components/schemas/ManagedEdgeNFService-Single' diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 44dc93e1c80245cd60b6bdd8aef483b28055fe5b..218c03a1401dd90c10d55c0281c4909f9849de4d 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP 5GC NRM - version: 18.8.0 + version: 19.2.0 description: >- OAS 3.0.1 specification of the 5GC NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -19,9 +19,9 @@ components: type: object description: 'AmfIdentifier comprise of amfRegionId, amfSetId and amfPointer' properties: - amfRegionId: + aMFRegionId: $ref: '#/components/schemas/AmfRegionId' - amfSetId: + aMFSetId: $ref: '#/components/schemas/AmfSetId' amfPointer: $ref: '#/components/schemas/AmfPointer' @@ -59,17 +59,21 @@ components: type: object description: 'NF profile stored in NRF, defined in TS 29.510' properties: - nFInstanceId: + nfInstanceId: type: string description: uuid of NF instance - nFType: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' - nFStatus: + nfType: + $ref: '#/components/schemas/NFType' + nfStatus: $ref: '#/components/schemas/NFStatus' plmn: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' sNssais: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' + type: array + items: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' fqdn: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' interPlmnFqdn: @@ -86,10 +90,19 @@ components: type: string serviceName: type: string - version: - type: string + versions: + type: array + items: + type: string schema: type: string + nfServiceStatus: + type: string + enum: + - REGISTERED + - SUSPENDED + - UNDISCOVERABLE + - CANARY_RELEASE fqdn: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' interPlmnFqdn: @@ -98,18 +111,55 @@ components: type: array items: $ref: '#/components/schemas/IpEndPoint' - apiPrfix: + apiPrefix: type: string - allowedPlmns: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + allowedPLMNs: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + allowedSnpns: + type: array + items: + $ref: '#/components/schemas/SnpnId' allowedNfTypes: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' - allowedNssais: + $ref: '#/components/schemas/NFType' + allowedNfDomains: + type: array + items: + type: string + allowedNSSAIs: type: array items: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' + priority: + type: integer + minimum: 0 + maximum: 65535 + capacity: + type: integer + recoveryTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + vendorId: + $ref: '#/components/schemas/VendorId' + allowedOperationsPerNfType: + type: string + allowedOperationsPerNfInstance: + type: string + allowedOperationsPerNfInstanceOverrides: + type: boolean + sNssais: + $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai' + oauth2Required: + type: boolean + sharedServiceDataId: + type: string + defaultNotificationSubscriptions: + type: array + items: + $ref: '#/components/schemas/DefaultNotificationSubscription' + NFStatus: type: string description: any of enumerated value @@ -119,10 +169,10 @@ components: CNSIIdList: type: array items: - $ref: '#/components/schemas/CNSIId' + $ref: '#/components/schemas/CNSIId' CNSIId: type: string - description: CNSI Id is defined in TS 29.531, only for Core Network + description: CNSI Id is defined in TS 29.531, only for Core Network. EnergySavingControl: type: string description: any of enumerated value @@ -131,6 +181,7 @@ components: - TO_BE_NOT_ENERGYSAVING EnergySavingState: type: string + readOnly: true description: any of enumerated value enum: - IS_NOT_ENERGYSAVING @@ -150,6 +201,7 @@ components: properties: nFSrvGroupId: type: string + readOnly: true supiRanges: type: array items: @@ -186,8 +238,12 @@ components: - P_BDT - P_PLMNUE - P_NSSCD + - P_PDTQ + - P_MBSCD + - P_GROUP NotificationType: type: string + readOnly: true enum: - N1_MESSAGES - N2_INFORMATION @@ -197,6 +253,12 @@ components: - LOCATION_UPDATE_NOTIFICATION - NSSAA_REAUTH_NOTIFICATION - NSSAA_REVOC_NOTIFICATION + - MATCH_INFO_NOTIFICATION + - DATA_RESTORATION_NOTIFICATION + - TSCTS_NOTIFICATION + - LCS_KEY_DELIVERY_NOTIFICATION + - UUAA_MM_AUTH_NOTIFICATION + - DC_SESSION_EVENT_NOTIFICATION DefaultNotificationSubscription: type: object properties: @@ -204,21 +266,58 @@ components: $ref: '#/components/schemas/NotificationType' callbackURI: type: string + readOnly: true + interPlmnCallbackUri: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/UriRo' n1MessageClass: type: boolean + readOnly: true n2InformationClass: type: boolean + readOnly: true versions: type: string + readOnly: true binding: type: string + readOnly: true + acceptedEncoding: + type: string + readOnly: true + supportedFeatures: + type: string + readOnly: true + serviceInfoList: + type: array + items: + $ref: '#/components/schemas/DefSubServiceInfo' + callbackUriPrefix: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/UriRo' + DefSubServiceInfo: + type: object + properties: + versions: + type: array + items: + type: string + readOnly: true + supportedFeatures: + type: string + readOnly: true ManagedNFProfile: type: object properties: + hniList: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' + interPlmnFqdn: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' nfInstanceID: type: string + readOnly: true nfType: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' heartbeatTimer: type: integer authzInfo: @@ -240,7 +339,7 @@ components: allowedNfTypes: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' allowedNfDomains: type: array items: @@ -263,20 +362,23 @@ components: type: string lcHSupportInd: type: boolean + readOnly: true olcHSupportInd: type: boolean + readOnly: true nfSetRecoveryTimeList: type: array items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' scpDomains: type: array items: type: string recoveryTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' nfServicePersistence: type: boolean + readOnly: true nfProfileChangesSupportInd: type: boolean defaultNotificationSubscriptions: @@ -287,12 +389,13 @@ components: serviceSetRecoveryTimeList: type: array items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' minItems: 1 vendorId: $ref: '#/components/schemas/VendorId' SEPPType: type: string + readOnly: true description: any of enumerated value enum: - CSEPP @@ -410,8 +513,10 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/Arp' qosNotificationControl: type: boolean + default: false reflectiveQos: type: boolean + default: false sharingKeyDl: type: string sharingKeyUl: @@ -458,6 +563,7 @@ components: minItems: 1 muteNotif: type: boolean + default: false trafficSteeringPolIdDl: type: string nullable: true @@ -470,6 +576,7 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/RouteToLocation' traffCorreInd: type: boolean + default: false upPathChgEvent: $ref: 'TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/UpPathChgEvent' steerFun: @@ -510,8 +617,10 @@ components: $ref: 'TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/AfSigProtocol' isAppRelocatable: type: boolean + default: false isUeAddrPreserved: type: boolean + default: false qosData: type: array items: @@ -546,23 +655,30 @@ components: $ref: '#/components/schemas/SnssaiInfo' isSubjectToNsac: type: boolean + default: false maxNumberofUEs: type: integer eACMode: type: string + readOnly: true enum: - INACTIVE - ACTIVE + default: INACTIVE activeEacThreshold: type: integer + default: 0 deactiveEacThreshold: type: integer + default: 100 numberofUEs: type: integer + readOnly: true uEIdList: type: array items: type: string + readOnly: true maxNumberofPDUSessions: type: integer @@ -575,7 +691,7 @@ components: type: string nRTACpattern: type: string - + TaiRange: type: object properties: @@ -585,7 +701,7 @@ components: type: array items: $ref: '#/components/schemas/NRTACRange' - + GUAMInfo: type: object properties: @@ -647,22 +763,24 @@ components: properties: 5GCNFType: type: string + readOnly: true enum: - PCF - NEF - SCEF 5GCNFIpAddress: type: string + readOnly: true 5GCNFRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' UPFConnectionInfo: type: object properties: uPFIpAddress: - type: string + $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostRo' uPFRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' SnssaiList: type: array items: @@ -679,7 +797,7 @@ components: TaiList: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' SupiRange: type: object properties: @@ -703,23 +821,31 @@ components: properties: proseDirectDiscovery: type: boolean + default: false proseDirectCommunication: type: boolean + default: false proseL2UetoNetworkRelay: type: boolean + default: false proseL3UetoNetworkRelay: type: boolean + default: false proseL2RemoteUe: type: boolean + default: false proseL3RemoteUe: type: boolean + default: false V2xCapability: type: object properties: lteV2x: type: boolean + default: false nrV2x: type: boolean + default: false InternalGroupIdRange: type: object properties: @@ -783,16 +909,29 @@ components: - N6MB - N19MB - NMB9 + - S1U + - S5U + - S8U + - S11U + - S12 + - S2AU + - S2BU + - N3TRUSTEDN3GPP + - N3UNTRUSTEDN3GPP + - N9ROAMING + - SGI + - N19 + - SXAU + - SXBU + - N4U ipv4EndpointAddresses: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' - minItems: 1 ipv6EndpointAddresses: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' - minItems: 1 fqdn: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' networkInstance: @@ -812,9 +951,13 @@ components: type: object properties: ipv4EndpointAddresses: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' ipv6EndpointAddresses: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' fqdn: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' @@ -981,6 +1124,10 @@ components: analyticsMetadataProvisioning: type: boolean default: false + roamingExchange: + type: boolean + default: false + MlAnalyticsInfo: description: ML Analytics Filter information supported by the Nnwdaf_MLModelProvision service type: object @@ -1043,7 +1190,7 @@ components: servingNfTypeList: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' minItems: 1 mlAnalyticsList: type: array @@ -1130,11 +1277,13 @@ components: items: type: string minItems: 1 + readOnly: true afIds: type: array items: type: string minItems: 1 + readOnly: true AfEvent: description: Represents Application Events. anyOf: @@ -1156,7 +1305,7 @@ components: - 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. + 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 @@ -1173,11 +1322,13 @@ components: items: type: string minItems: 1 + readOnly: true appIds: type: array items: type: string minItems: 1 + readOnly: true UnTrustAfInfo: description: Information of a untrusted AF Instance type: object @@ -1310,7 +1461,7 @@ components: minItems: 1 mappingInd: type: boolean - default: False + default: false ExternalClientType: description: Indicates types of External Clients. anyOf: @@ -1516,7 +1667,7 @@ components: servingNfTypeList: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' minItems: 1 servingNfSetIdList: type: array @@ -1538,7 +1689,7 @@ components: servingNfTypeList: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' servingNfSetIdList: type: array items: @@ -1721,8 +1872,10 @@ components: iwkEpsInd: type: boolean default: false + readOnly: true sxaInd: type: boolean + readOnly: true pduSessionTypes: type: array items: @@ -1733,6 +1886,7 @@ components: ueIpAddrInd: type: boolean default: false + readOnly: true taiList: type: array items: @@ -1759,6 +1913,7 @@ components: redundantGtpu: type: boolean default: false + readOnly: true ipups: type: boolean default: false @@ -1767,6 +1922,7 @@ components: default: false supportedPfcpFeatures: type: string + readOnly: true # upfEvents: # type: array # items: @@ -1801,9 +1957,11 @@ components: v2xSupportInd: type: boolean default: false + readOnly: true proseSupportInd: type: boolean default: false + readOnly: true proseCapability: $ref: '#/components/schemas/ProseCapability' v2xCapability: @@ -1811,11 +1969,13 @@ components: a2xSupportInd: type: boolean default: false + readOnly: true a2xCapability: $ref: '#/components/schemas/A2xCapability' rangingSlPosSupportInd: type: boolean - default: false + default: false + readOnly: true A2xCapability: description: Information of the supported A2X Capability by the PCF @@ -2281,14 +2441,14 @@ components: description: globally identification of an NG-RAN node type: object oneOf: - - required: [ pLmnId, n3IwfId] - - required: [ plmnId, gNbId] - - required: [ pLmnId, ngeNbId] - - required: [ plmnId, wagfId] - - required: [ pLmnId, tngfId] - - required: [ plmnId, twifId] + - required: [ pLMNId, n3IwfId] + - required: [ plMNId, gNbId] + - required: [ pLMNId, ngeNbId] + - required: [ plMNId, wagfId] + - required: [ pLMNId, tngfId] + - required: [ plMNId, twifId] properties: - pLmnId: + pLMNId: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' n3IwfId: type: string @@ -2307,7 +2467,12 @@ components: type: string pattern: '^[A-Fa-f0-9]+$' twifId: - type: string + type: string + NTNPLMNRestrictionsList: + description: NTNPLMNRestrictionsInfoList that relates to non-terrestrial network access + type: array + items: + $ref: '#/components/schemas/NTNPLMNRestrictionsInfo' NTNPLMNRestrictionsInfo: description: restrictions per PLMN that relates to non-terrestrial network access type: object @@ -2317,34 +2482,24 @@ components: blockedLocationInfoList: type: array items: - $ref: '#/components/schemas/BlockedLocationInfoList' - minItems: 1 - BlockedLocationInfoList: + $ref: '#/components/schemas/BlockedLocationInfo' + BlockedLocationInfo: description: location for which the PLMN access restrictions are to be applied in case of NTN type: object properties: blockedLocation: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' - blockedDur: - $ref: '#/components/schemas/TimeDuration' + blockedDurWindow: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' blockedSlice: - type: string - TimeDuration: - description: location for which the PLMN access restrictions are to be applied in case of NTN - type: object - properties: - blockedDurStartTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - blockedDurEndTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - + $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' 5GDdnmfInfo: description: Information of an 5G DDNMF NF Instance type: object required: - - plmnId + - plMNId properties: - plmnId: + plMNId: $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId' ImsiRange: description: > @@ -2555,7 +2710,7 @@ components: required: - mbsServiceIdStart - mbsServiceIdEnd - - plmnId + - plMNId properties: mbsServiceIdStart: type: string @@ -2563,7 +2718,7 @@ components: mbsServiceIdEnd: type: string pattern: '^[A-Fa-f0-9]{6}$' - plmnId: + plMNId: $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId' nid: $ref: 'TS29571_CommonData.yaml#/components/schemas/Nid' @@ -2618,11 +2773,11 @@ components: type: string pattern: '^[A-Fa-f0-9]{6}$' description: MBS Service ID - plmnId: + plMNId: $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId' required: - mbsServiceId - - plmnId + - plMNId Ssm: description: Source specific IP multicast address @@ -2676,7 +2831,7 @@ components: description: Contains the NCGI (NR Cell Global Identity), as described in 3GPP 23.003 type: object properties: - plmnId: + plMNId: $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId' nrCellId: type: string @@ -2864,7 +3019,7 @@ components: pLMNInfo: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfo' expiryTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' PcscfInfo: description: Information of a P-CSCF NF Instance type: object @@ -2918,7 +3073,113 @@ components: type: object properties: nfType: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' + SAP: + type: object + properties: + host: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' + port: + type: integer + NFServiceType: + type: string + enum: + - NAMF_COMMUNICATION + - NAMF_EVENTEXPOSURE + - NAMF_MT + - NAMF_LOCATION + - NSMF_PDUSESSION + - NSMF_EVENTEXPOSURE + - OTHERS + readOnly: true + Operation: + type: object + properties: + name: + type: string + readOnly: true + allowedNFTypes: + $ref: '#/components/schemas/NFType' + operationSemantics: + $ref: '#/components/schemas/OperationSemantics' + NFType: + description: NF name defined in TS 23.501 or TS 29.510'.This datatype is used for writable attribute + type: string + enum: + - NRF + - UDM + - AMF + - SMF + - AUSF + - NEF + - PCF + - SMSF + - NSSF + - UDR + - LMF + - GMLC + - 5G_EIR + - SEPP + - UPF + - N3IWF + - AF + - UDSF + - DN + - BSF + - CHF + - NWDAF + - PCSCF + - CBCF + - HSS + - UCMF + - SOR_AF + - SPAF + - MME + - SCSAS + - SCEF + - SCP + - NSSAAF + - ICSCF + - SCSCF + - DRA + - IMS_AS + - AANF + - 5G_DDNMF + - NSACF + - MFAF + - EASDF + - DCCF + - MB_SMF + - TSCTSF + - ADRF + - GBA_BSF + - CEF + - MB_UPF + - NSWOF + - PKMF + - MNPF + - SMS_GMSC + - SMS_IWMSC + - MBSF + - MBSTF + - PANF + - TNGF + - W_AGF + - TWIF + - TSN_AF + + OperationSemantics: + type: string + readOnly: true + enum: + - REQUEST_RESPONSE + - SUBSCRIBE_NOTIFY + RegistrationState: + type: string + readOnly: true + enum: + - REGISTERED + - DEREGISTERED #-------- Definition of types for name-containments ------ SubNetwork-ncO-5GcNrm: @@ -3030,8 +3291,6 @@ components: $ref: '#/components/schemas/AmfIdentifier' sBIFqdn: type: string - interPlmnFQDN: - type: string weightFactor: $ref: '#/components/schemas/WeightFactor' cNSIIdList: @@ -3042,8 +3301,8 @@ components: $ref: '#/components/schemas/ManagedNFProfile' commModelList: $ref: '#/components/schemas/CommModelList' - nTNPLMNInfoList: - $ref: '#/components/schemas/NTNPLMNRestrictionsInfo' + nTNPLMNRestrictionsList: + $ref: '#/components/schemas/NTNPLMNRestrictionsList' amfInfo: $ref: '#/components/schemas/AmfInfo' sliceExpiryInfo: @@ -3054,7 +3313,9 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' mdtUserConsentReqList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/MdtUserConsentReqList' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N2: @@ -3077,8 +3338,8 @@ components: $ref: '#/components/schemas/EP_N22-Multiple' EP_N26: $ref: '#/components/schemas/EP_N26-Multiple' - EP_NLS: - $ref: '#/components/schemas/EP_NLS-Multiple' + EP_NL1: + $ref: '#/components/schemas/EP_NL1-Multiple' EP_NL2: $ref: '#/components/schemas/EP_NL2-Multiple' EP_N58: @@ -3158,16 +3419,19 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' SmfInfo: - $ref: '#/components/schemas/SmfInfo' + type: array + items: + $ref: '#/components/schemas/SmfInfo' configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' dnaiSatelliteMappingList: type: array items: $ref: '#/components/schemas/dnaiSatelliteMapping' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N4: @@ -3222,8 +3486,11 @@ components: supportedBMOList: $ref: '#/components/schemas/SupportedBMOList' upfInfo: - $ref: '#/components/schemas/UpfInfo' + type: array + items: + $ref: '#/components/schemas/UpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N3: @@ -3251,6 +3518,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N3: @@ -3278,14 +3546,17 @@ components: supportedBMOList: $ref: '#/components/schemas/SupportedBMOList' PcfInfo: - $ref: '#/components/schemas/PcfInfo' + type: array + items: + $ref: '#/components/schemas/PcfInfo' configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' predefinedPccRuleSetRefs: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N5: @@ -3324,6 +3595,7 @@ components: ausfInfo: $ref: '#/components/schemas/AusfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N12: @@ -3355,6 +3627,7 @@ components: udmInfo: $ref: '#/components/schemas/UdmInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N8: @@ -3388,6 +3661,7 @@ components: udrInfo: $ref: '#/components/schemas/UdrInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' UdsfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3407,6 +3681,7 @@ components: udsfInfo: $ref: '#/components/schemas/UdsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' NrfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3428,6 +3703,7 @@ components: nrfInfo: $ref: '#/components/schemas/NrfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N27: @@ -3457,6 +3733,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N22: @@ -3486,6 +3763,7 @@ components: smsfInfo: $ref: '#/components/schemas/SmsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N20: @@ -3519,10 +3797,17 @@ components: mappedCellIdInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: - EP_NLS: - $ref: '#/components/schemas/EP_NLS-Multiple' + EP_NL1: + $ref: '#/components/schemas/EP_NL1-Multiple' + EP_NL8: + $ref: '#/components/schemas/EP_NL8-Multiple' + EP_NL7: + $ref: '#/components/schemas/EP_NL7-Multiple' + EP_NL10: + $ref: '#/components/schemas/EP_NL10-Multiple' NgeirFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3544,6 +3829,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N17: @@ -3559,16 +3845,18 @@ components: - type: object properties: plmnId: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnIdRo' sEPPType: $ref: '#/components/schemas/SEPPType' sEPPId: type: integer + readOnly: true fqdn: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' seppInfo: $ref: '#/components/schemas/SeppInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N32: @@ -3601,10 +3889,16 @@ components: $ref: '#/components/schemas/NwdafInfo' nwdafLogicalFuncSupported: type: string + readOnly: true enum: - NWDAF_WITH_ANLF - NWDAF_WITH_MTLF - NWDAF_WITH_ANLF_MTLF + roamingAnalytics: + type: boolean + roamingData: + type: boolean + - type: object properties: EP_NL3: @@ -3614,7 +3908,7 @@ components: AnLFFunction: $ref: '#/components/schemas/AnLFFunction-Single' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ScpFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3632,6 +3926,7 @@ components: scpInfo: $ref: '#/components/schemas/ScpInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_SM13: @@ -3656,9 +3951,11 @@ components: $ref: '#/components/schemas/CapabilityList' isCAPIFSup: type: boolean + readOnly: true nefInfo: $ref: '#/components/schemas/NefInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N33: @@ -3691,6 +3988,7 @@ components: nsacfInfo: $ref: '#/components/schemas/NsacfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N60: @@ -3715,6 +4013,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_Npc4: @@ -3747,6 +4046,7 @@ components: easdfInfo: $ref: '#/components/schemas/EasdfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N88: @@ -3768,11 +4068,11 @@ components: eDNServiceArea: $ref: 'TS28538_EdgeNrm.yaml#/components/schemas/ServingLocation' eASIpAddress: - type: string + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' eESIpAddress: - type: string + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' eCSIpAddress: - type: string + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' ednIdentifier: type: string ecmConnectionType: @@ -3802,6 +4102,7 @@ components: amfIdentifier: $ref: '#/components/schemas/AmfIdentifier' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ExternalNrfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3815,6 +4116,7 @@ components: plmnIdList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ExternalNssfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3828,6 +4130,7 @@ components: plmnIdList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ExternalSeppFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3839,13 +4142,14 @@ components: - type: object properties: plmnId: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnIdRo' sEPPId: type: integer + readOnly: true fqdn: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/FqdnRo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' EP_N2-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3875,7 +4179,7 @@ components: remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' epTransportRefs: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' EP_N4-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4267,7 +4571,7 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' - EP_NLS-Single: + EP_NL1-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -4337,6 +4641,34 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + EP_NL7-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_NL8-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_NL9-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4351,7 +4683,20 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' - + EP_NL10-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_N60-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4447,7 +4792,7 @@ components: allOf: - type: object properties: - FiveQiDscpMappingList: + fiveQiDscpMappingList: type: array items: $ref: '#/components/schemas/FiveQiDscpMapping' @@ -4529,10 +4874,16 @@ components: maximum: 255 isEventTriggeredGtpUPathMonitoringSupported: type: boolean + readOnly: true + default: true isPeriodicGtpUMonitoringSupported: type: boolean + readOnly: true + default: true isImmediateGtpUMonitoringSupported: type: boolean + readOnly: true + default: true gtpUPathDelayThresholds: $ref: '#/components/schemas/GtpUPathDelayThresholdsType' gtpUPathMinimumWaitTime: @@ -4566,10 +4917,16 @@ components: maximum: 255 isEventTriggeredQFMonitoringSupported: type: boolean + readOnly: true + default: true isPeriodicQFMonitoringSupported: type: boolean + readOnly: true + default: true isSessionReleasedQFMonitoringSupported: type: boolean + readOnly: true + default: true qFPacketDelayThresholds: $ref: '#/components/schemas/QFPacketDelayThresholdsType' qFMinimumWaitTime: @@ -4610,6 +4967,7 @@ components: trustAfInfo: $ref: '#/components/schemas/TrustAfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N5: @@ -4637,13 +4995,14 @@ components: type: string cNSIIdList: $ref: '#/components/schemas/CNSIIdList' - nFProfileList: - $ref: '#/components/schemas/NFProfileList' + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' commModelList: $ref: '#/components/schemas/CommModelList' nssafInfo: $ref: '#/components/schemas/NssaafInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' EP_N58-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4695,6 +5054,7 @@ components: dccfInfo: $ref: '#/components/schemas/DccfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' MfafFunction-Single: allOf: @@ -4717,6 +5077,7 @@ components: mfafInfo: $ref: '#/components/schemas/MfafInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ChfFunction-Single: allOf: @@ -4739,6 +5100,7 @@ components: chfInfo: $ref: '#/components/schemas/ChfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N28: @@ -4901,6 +5263,7 @@ components: gmlcInfo: $ref: '#/components/schemas/GmlcInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_NL2: @@ -4913,6 +5276,8 @@ components: $ref: '#/components/schemas/EP_NL6-Multiple' EP_NL9: $ref: '#/components/schemas/EP_NL9-Multiple' + EP_NL10: + $ref: '#/components/schemas/EP_NL10-Multiple' TsctsfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4934,6 +5299,7 @@ components: tsctsfInfo: $ref: '#/components/schemas/TsctsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N84: @@ -5055,8 +5421,11 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' bsfInfo: - $ref: '#/components/schemas/BsfInfo' + type: array + items: + $ref: '#/components/schemas/BsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' MbSmfFunction-Single: allOf: @@ -5077,6 +5446,7 @@ components: mbSmfInfo: $ref: '#/components/schemas/MbSmfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N11mb: @@ -5150,6 +5520,7 @@ components: mbUpfInfo: $ref: '#/components/schemas/MbUpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N3mb: @@ -5180,6 +5551,7 @@ components: mnpfInfo: $ref: '#/components/schemas/MnpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_SM12: @@ -5259,6 +5631,11 @@ components: enum: - ACTIVATED - DEACTIVATED + readOnly: true + mLModelRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' + aIMLInferenceFunctionRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' EP_SM12-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -5301,9 +5678,46 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' +#-------- Definition of abstract IOCs -------------------------------------------- + ManagedFunction5GC-nc0: + type: object + properties: + ManagedNFService: + $ref: '#/components/schemas/ManagedNFService-Multiple' +#-------- Definition of abstract IOCs -------------------------------------------- -#-------- Definition of JSON arrays for name-contained IOCs ---------------------- +#-------- Definition of 5GC common IOCs -------------------------------------------- + ManagedNFService-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + userLabel: + type: string + nFServiceType: + $ref: '#/components/schemas/NFServiceType' + sAP: + $ref: '#/components/schemas/SAP' + operations: + type: array + items: + $ref: '#/components/schemas/Operation' + administrativeState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' + operationalState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' + usageState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/UsageState' + registrationState: + $ref: '#/components/schemas/RegistrationState' + +#-------- Definition of 5GC common IOCs -------------------------------------------- + +#-------- Definition of JSON arrays for name-contained IOCs ---------------------- AmfFunction-Multiple: type: array items: @@ -5549,10 +5963,10 @@ components: type: array items: $ref: '#/components/schemas/EP_MAP_SMSC-Single' - EP_NLS-Multiple: + EP_NL1-Multiple: type: array items: - $ref: '#/components/schemas/EP_NLS-Single' + $ref: '#/components/schemas/EP_NL1-Single' EP_NL2-Multiple: type: array items: @@ -5569,10 +5983,22 @@ components: type: array items: $ref: '#/components/schemas/EP_NL6-Single' + EP_NL7-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_NL7-Single' + EP_NL8-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_NL8-Single' EP_NL9-Multiple: type: array items: $ref: '#/components/schemas/EP_NL9-Single' + EP_NL10-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_NL10-Single' EP_N60-Multiple: type: array items: @@ -5741,7 +6167,10 @@ components: type: array items: $ref: '#/components/schemas/MnpfFunction-Single' - + ManagedNFService-Multiple: + type: array + items: + $ref: '#/components/schemas/ManagedNFService-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- resources-5gcNrm: @@ -5766,6 +6195,7 @@ components: - $ref: '#/components/schemas/NefFunction-Single' - $ref: '#/components/schemas/NsacfFunction-Single' - $ref: '#/components/schemas/DDNMFFunction-Single' + - $ref: '#/components/schemas/ManagedNFService-Single' - $ref: '#/components/schemas/ExternalAmfFunction-Single' - $ref: '#/components/schemas/ExternalNrfFunction-Single' @@ -5838,12 +6268,15 @@ components: - $ref: '#/components/schemas/EP_S5U-Single' - $ref: '#/components/schemas/EP_Rx-Single' - $ref: '#/components/schemas/EP_MAP_SMSC-Single' - - $ref: '#/components/schemas/EP_NLS-Single' + - $ref: '#/components/schemas/EP_NL1-Single' - $ref: '#/components/schemas/EP_NL2-Single' - $ref: '#/components/schemas/EP_NL3-Single' - $ref: '#/components/schemas/EP_NL5-Single' - $ref: '#/components/schemas/EP_NL6-Single' + - $ref: '#/components/schemas/EP_NL7-Single' + - $ref: '#/components/schemas/EP_NL8-Single' - $ref: '#/components/schemas/EP_NL9-Single' + - $ref: '#/components/schemas/EP_NL10-Single' - $ref: '#/components/schemas/EP_N11mb-Single' - $ref: '#/components/schemas/EP_N16mb-Single' - $ref: '#/components/schemas/EP_Nmb1-Single' diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 62e23de93760987a78e011b7ca67c887b8be1dac..7d47c2449668970a203548af4b7c570932c1f13c 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: NR NRM - version: 18.8.0 + version: 19.2.0 description: >- OAS 3.0.1 specification of the NR NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -34,6 +34,7 @@ components: type: integer minimum: 0 maximum: 68719476735 + readOnly: true Sst: type: integer @@ -50,6 +51,7 @@ components: PlmnIdList: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' PlmnInfo: @@ -63,26 +65,44 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' PlmnInfoList: type: array + uniqueItems: true items: - $ref: '#/components/schemas/PlmnInfo' + $ref: '#/components/schemas/PlmnInfo' + minItems: 1 NpnIdentityList: type: array + uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type' + minItems: 1 GGnbId: - type: string - pattern: '^[0-9]{3}[0-9]{2,3}-(22|23|24|25|26|27|28|29|30|31|32)-[0-9]{1,10}' + type: object + properties: + plmnId: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + gnbIdLength: + $ref: '#/components/schemas/GnbIdLength' + gnbId: + $ref: '#/components/schemas/GnbId' GEnbId: - type: string - pattern: '^[0-9]{3}[0-9]{2,3}-(18|20|21|22)-[0-9]{1,7}' + type: object + properties: + plmnId: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + enbId: + type: integer + minimum: 0 + maximum: 4194303 GGnbIdList: type: array + uniqueItems: true items: $ref: '#/components/schemas/GGnbId' GEnbIdList: type: array + uniqueItems: true items: $ref: '#/components/schemas/GEnbId' @@ -93,12 +113,14 @@ components: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' NrTacList: type: array + uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' TaiList: type: array + uniqueItems: true items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' BackhaulAddress: type: object properties: @@ -109,7 +131,7 @@ components: MappingSetIDBackhaulAddress: type: object properties: - setID: + setId: type: integer backhaulAddress: $ref: '#/components/schemas/BackhaulAddress' @@ -167,13 +189,24 @@ components: type: integer minimum: 0 maximum: 100 - numberOfPreamblesSent: - type: integer - minimum: 0 - maximum: 200 + maxNumberOfPreamblesSent: + type: string + enum: + - n3 + - n4 + - n5 + - n6 + - n7 + - n8 + - n10 + - n20 + - n50 + - n100 + - n200 UeAccDelayProbabilityDist: type: array + uniqueItems: true items: $ref: '#/components/schemas/UeAccDelayProbability' @@ -191,6 +224,7 @@ components: NRPciList: type: array + uniqueItems: true items: $ref: '#/components/schemas/NrPci' minItems: 0 @@ -198,6 +232,7 @@ components: CSonPciList: type: array + uniqueItems: true items: $ref: '#/components/schemas/NrPci' minItems: 1 @@ -234,6 +269,7 @@ components: - IDLE - INACTIVE - ACTIVE + readOnly: true CyclicPrefix: type: string enum: @@ -275,15 +311,15 @@ components: $ref: '#/components/schemas/Snssai' RrmPolicyMemberList: type: array + uniqueItems: true items: $ref: '#/components/schemas/RrmPolicyMember' + minItems: 1 AddressWithVlan: type: object properties: - ipv4Address: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' - ipv6Address: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' + iPAddress: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' vlanId: type: integer minimum: 0 @@ -298,30 +334,10 @@ components: minimum: 0 maximum: 65535 RemoteAddress: - type: object - properties: - ipv4Address: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' - ipv6Address: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' - - CellIndividualOffset: - type: object - properties: - rsrpOffsetSSB: - type: integer - rsrqOffsetSSB: - type: integer - sinrOffsetSSB: - type: integer - rsrpOffsetCSI-RS: - type: integer - rsrqOffsetCSI-RS: - type: integer - sinrOffsetCSI-RS: - type: integer + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' QOffsetRange: type: integer + default: 0 enum: - -24 - -22 @@ -354,23 +370,9 @@ components: - 3 - 2 - 1 - QOffsetRangeList: - type: object - properties: - rsrpOffsetSSB: - $ref: '#/components/schemas/QOffsetRange' - rsrqOffsetSSB: - $ref: '#/components/schemas/QOffsetRange' - sinrOffsetSSB: - $ref: '#/components/schemas/QOffsetRange' - rsrpOffsetCSI-RS: - $ref: '#/components/schemas/QOffsetRange' - rsrqOffsetCSI-RS: - $ref: '#/components/schemas/QOffsetRange' - sinrOffsetCSI-RS: - $ref: '#/components/schemas/QOffsetRange' QOffsetFreq: type: number + default: 0 TReselectionNRSf: type: integer enum: @@ -413,7 +415,6 @@ components: type: integer minimum: -1800 maximum: 1800 - RSSetId: type: integer maximum: 4194303 @@ -440,9 +441,16 @@ components: rimRSStartingFrequencyOffsetIdList: type: array + uniqueItems: true items: type: integer - + minimum: 0 + maximum: 550 + minItems: 1 + maxItems: 4 + description: > + It is a list of configured frequency offsets in units of resource blocks. + Only 1,2 or 4 number of elements allowed in the array. SequenceDomainPara: type: object properties: @@ -450,19 +458,30 @@ components: type: integer rimRSScrambleIdListofRS1: type: array + uniqueItems: true items: type: integer + minimum: 0 + maximum: 1023 + minItems: 1 + maxItems: 8 nrofRIMRSSequenceCandidatesofRS2: type: integer rimRSScrambleIdListofRS2: type: array + uniqueItems: true items: type: integer + minimum: 0 + maximum: 1023 + minItems: 1 + maxItems: 8 enableEnoughNotEnoughIndication: type: string enum: - ENABLE - - DISABLE + - DISABLE + default: DISABLE rIMRSScrambleTimerMultiplier: type: integer rIMRSScrambleTimerOffset: @@ -513,22 +532,26 @@ components: type: integer consecutiveRIMRS1List: type: array + uniqueItems: true items: type: integer consecutiveRIMRS2List: type: array + uniqueItems: true items: type: integer enablenearfarIndicationRS1: type: string enum: - ENABLE - - DISABLE + - DISABLE + default: DISABLE enablenearfarIndicationRS2: type: string enum: - ENABLE - - DISABLE + - DISABLE + default: DISABLE RimRSReportInfo: type: object @@ -552,7 +575,8 @@ components: type: string enum: - ENABLE - - DISABLE + - DISABLE + default: DISABLE reportInterval: type: integer nrofRIMRSReportInfo: @@ -561,23 +585,24 @@ components: type: integer rimRSReportInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/RimRSReportInfo' - TceMappingInfo: + TceIDMappingInfo: type: object properties: - TceIPAddress: - oneOf: - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' - TceID: + tceIPAddress: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' + tceID: type: integer - PlmnTarget: + pLMNTarget: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' - TceMappingInfoList: + TceIDMappingInfoList: type: array + uniqueItems: true items: - $ref: '#/components/schemas/TceMappingInfo' + $ref: '#/components/schemas/TceIDMappingInfo' + minItems: 1 ResourceType: type: string enum: @@ -596,6 +621,7 @@ components: NTNTAClist: type: array + uniqueItems: true items: $ref: '#/components/schemas/NrTac' @@ -620,34 +646,42 @@ components: EphemerisInfos: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ephemeris' + minItems: 1 PositionVelocity: type: object properties: positionX: type: integer + default: 0 minimum: 0 maximum: 604800 positionY: type: integer + default: 0 minimum: 0 maximum: 604800 positionZ: type: integer + default: 0 minimum: 0 maximum: 604800 velocityVX: type: integer + default: 0 minimum: -131072 maximum: 131071 velocityVY: type: integer + default: 0 minimum: -131072 maximum: 131071 velocityVZ: type: integer + default: 0 minimum: -131072 maximum: 131071 @@ -656,26 +690,32 @@ components: properties: semiMajorAxis: type: integer + default: 0 minimum: 0 maximum: 8589934591 eccentricity: type: integer + default: 0 minimum: -524288 maximum: 524287 periapsis: type: integer + default: 0 minimum: 0 maximum: 16777215 longitude: type: integer + default: 0 minimum: 0 maximum: 2097151 inclination: type: integer + default: 0 minimum: -524288 maximum: 524287 meanAnomaly: type: integer + default: 0 minimum: 0 maximum: 16777215 @@ -688,6 +728,7 @@ components: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Ncgi' MappedCellIdInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/MappedCellIdInfo' QceIdMappingInfo: @@ -703,10 +744,13 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' QceIdMappingInfoList: type: array + uniqueItems: true items: - $ref: '#/components/schemas/QceIdMappingInfo' + $ref: '#/components/schemas/QceIdMappingInfo' + minItems: 1 MdtUserConsentReqList: type: array + uniqueItems: true items: type: string enum: @@ -823,7 +867,7 @@ components: configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -870,7 +914,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: description: This attribute is condition optional. The condition is NG-RAN Multi-Operator Core Network (NG-RAN MOCN) network sharing with operator specific 5QI is supported. - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' NrOperatorCellDu: $ref: '#/components/schemas/NrOperatorCellDu-Multiple' GnbCuUpFunction-Single: @@ -894,7 +938,7 @@ components: configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -947,16 +991,20 @@ components: $ref: '#/components/schemas/GEnbIdList' xnHOBlackList: $ref: '#/components/schemas/GGnbIdList' - mappingSetIDBackhaulAddress: - $ref: '#/components/schemas/MappingSetIDBackhaulAddress' - tceMappingInfoList: - $ref: '#/components/schemas/TceMappingInfoList' + mappingSetIDBackhaulAddressList: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/MappingSetIDBackhaulAddress' + minItems: 1 + tceIDMappingInfoList: + $ref: '#/components/schemas/TceIDMappingInfoList' configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' ephemerisInfoSetRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' dCHOControl: type: boolean dDAPSHOControl: @@ -967,6 +1015,10 @@ components: $ref: '#/components/schemas/QceIdMappingInfoList' mdtUserConsentReqList: $ref: '#/components/schemas/MdtUserConsentReqList' + mWABRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' + nRECMappingRuleRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -996,6 +1048,10 @@ components: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Configurable5QISet-Multiple' Dynamic5QISet: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' + NRNetwork: + $ref: '#/components/schemas/NRNetwork-Single' + EUtranNetwork: + $ref: '#/components/schemas/EUtraNetwork-Single' NrCellCu-Single: allOf: @@ -1012,7 +1068,7 @@ components: plmnInfoList: $ref: '#/components/schemas/PlmnInfoList' nRFrequencyRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -1091,20 +1147,22 @@ components: $ref: '#/components/schemas/SsbDuration' nrSectorCarrierRef: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' bwpRef: description: "Condition is BWP sets are not supported" type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' bwpSetRef: description: "Condition is BWP sets are supported" $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' rimRSMonitoringStartTime: - type: string + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' rimRSMonitoringStopTime: - type: string + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' rimRSMonitoringWindowDuration: type: integer rimRSMonitoringWindowStartingOffset: @@ -1138,6 +1196,7 @@ components: properties: bWPlist: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' maxItems: 12 @@ -1175,6 +1234,7 @@ components: type: integer minimum: 1 maximum: 256 + readOnly: true EUtranFrequency-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1258,11 +1318,18 @@ components: digitalAzimuth: $ref: '#/components/schemas/DigitalAzimuth' digitalTilt: - $ref: '#/components/schemas/DigitalTilt' + $ref: '#/components/schemas/DigitalTilt' - type: object properties: Beam: $ref: '#/components/schemas/Beam-Multiple' + CCOWeakCoverageParameters: + $ref: '#/components/schemas/CCOWeakCoverageParameters-Single' + CCOPilotPollutionParameters: + $ref: '#/components/schemas/CCOWeakCoverageParameters-Single' + CCOOvershootCoverageParameters: + $ref: '#/components/schemas/CCOOvershootCoverageParameters-Single' + Beam-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1274,24 +1341,30 @@ components: properties: beamIndex: type: integer + readOnly: true beamType: type: string + readOnly: true enum: - - SSB_BEAM + - SSB_BEAM beamAzimuth: type: integer + readOnly: true minimum: -1800 maximum: 1800 beamTilt: type: integer + readOnly: true minimum: -900 maximum: 900 beamHorizWidth: type: integer + readOnly: true minimum: 0 maximum: 3599 beamVertWidth: type: integer + readOnly: true minimum: 0 maximum: 1800 RRMPolicyRatio-Single: @@ -1331,7 +1404,11 @@ components: nRTCI: type: integer cellIndividualOffset: - $ref: '#/components/schemas/CellIndividualOffset' + type: array + items: + $ref: '#/components/schemas/QOffsetRange' + minItems: 6 + maxItems: 6 adjacentNRCellRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' nRFreqRelationRef: @@ -1368,15 +1445,27 @@ components: type: object properties: offsetMO: - $ref: '#/components/schemas/QOffsetRangeList' + type: array + items: + $ref: '#/components/schemas/QOffsetRange' + minItems: 6 + maxItems: 6 blockListEntry: type: array + uniqueItems: true items: type: integer minimum: 0 - maximum: 1007 + maximum: 503 + maxItems: 16 blockListEntryIdleMode: - type: integer + type: array + uniqueItems: true + items: + type: integer + minimum: 0 + maximum: 1007 + maxItems: 16 cellReselectionPriority: type: integer cellReselectionSubPriority: @@ -1431,17 +1520,30 @@ components: type: object properties: cellIndividualOffset: - $ref: '#/components/schemas/CellIndividualOffset' - blackListEntry: type: array + items: + $ref: '#/components/schemas/QOffsetRange' + minItems: 6 + maxItems: 6 + blockListEntry: + type: array + uniqueItems: true + items: + type: integer + minimum: 0 + maximum: 503 + maxItems: 16 + blockListEntryIdleMode: + type: array + uniqueItems: true items: type: integer minimum: 0 maximum: 1007 - blackListEntryIdleMode: - type: integer + maxItems: 16 cellReselectionPriority: type: integer + default: 0 cellReselectionSubPriority: type: number minimum: 0.2 @@ -1524,18 +1626,20 @@ components: $ref: "#/components/schemas/InterRatEsDeactivationCandidateCellParameters" isProbingCapable: type: string + readOnly: true enum: - YES - NO energySavingState: type: string + readOnly: true enum: - IS_NOT_ENERGY_SAVING - IS_ENERGY_SAVING mLModelRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' aIMLInferenceFunctionRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' DRACHOptimizationFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1570,9 +1674,9 @@ components: tstoreUEcntxt: $ref: '#/components/schemas/TstoreUEcntxt' mLModelRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' aIMLInferenceFunctionRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' DLBOFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1588,9 +1692,9 @@ components: minimumTimeBetweenHoTriggerChange: $ref: '#/components/schemas/MinimumTimeBetweenHoTriggerChange' mLModelRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' aIMLInferenceFunctionRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' DPCIConfigurationFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1682,7 +1786,7 @@ components: setType: $ref: '#/components/schemas/RSSetType' nRCellDURefs: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' ExternalGnbDuFunction-Single: allOf: @@ -1705,6 +1809,21 @@ components: $ref: '#/components/schemas/EP_F1C-Multiple' EP_F1U: $ref: '#/components/schemas/EP_F1U-Multiple' + NRNetwork-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + NRFrequency: + $ref: '#/components/schemas/NRFrequency-Multiple' + ExternalGnbCuCpFunction: + $ref: '#/components/schemas/ExternalGnbCuCpFunction-Multiple' + ExternalGnbCuUpFunction: + $ref: '#/components/schemas/ExternalGnbCuUpFunction-Multiple' + ExternalGnbDuFunction: + $ref: '#/components/schemas/ExternalGnbDuFunction-Multiple' + + ExternalGnbCuUpFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1770,11 +1889,26 @@ components: type: integer nrPci: $ref: '#/components/schemas/NrPci' - plmnIdList: - $ref: '#/components/schemas/PlmnIdList' + plMNIdList: + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + minItems: 1 + maxItems: 12 nRFrequencyRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + EUtraNetwork-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + EUtranFrequency: + $ref: '#/components/schemas/EUtranFrequency-Multiple' + ExternalENBFunction: + $ref: '#/components/schemas/ExternalENBFunction-Multiple' + ExternalENBFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1905,7 +2039,7 @@ components: remoteAddress: $ref: '#/components/schemas/RemoteAddress' epTransportRefs: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' EP_NgU-Single: allOf: @@ -1922,7 +2056,7 @@ components: remoteAddress: $ref: '#/components/schemas/RemoteAddress' epTransportRefs: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' EP_X2U-Single: allOf: @@ -2030,6 +2164,34 @@ components: properties: ephemerisInfos: $ref: '#/components/schemas/EphemerisInfos' + MWAB-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + administrativeState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' + operationalState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' + + NRECMappingRule-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + ecMRInputMinimumValue: + type: integer + ecMRInputMaximumValue: + type: integer + ecTimeInterval: + type: integer #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -2189,6 +2351,10 @@ components: type: array items: $ref: '#/components/schemas/EphemerisInfoSet-Single' + NRECMappingRule-Multiple: + type: array + items: + $ref: '#/components/schemas/NRECMappingRule-Single' #-------- Definitions in TS 28.541 for TS 28.532 --------------------------------- @@ -2203,6 +2369,9 @@ components: - $ref: '#/components/schemas/NrCellDu-Single' - $ref: '#/components/schemas/NrOperatorCellDu-Single' + - $ref: '#/components/schemas/NRNetwork-Single' + - $ref: '#/components/schemas/EUtraNetwork-Single' + - $ref: '#/components/schemas/NRFrequency-Single' - $ref: '#/components/schemas/EUtranFrequency-Single' @@ -2253,4 +2422,5 @@ components: - $ref: '#/components/schemas/CCOOvershootCoverageParameters-Single' - $ref: '#/components/schemas/NTNFunction-Single' - $ref: '#/components/schemas/EphemerisInfoSet-Single' - + - $ref: '#/components/schemas/MWAB-Single' + - $ref: '#/components/schemas/NRECMappingRule-Single' diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 121dc8f67f4d2c3a97d27200e1c9a19d54ea757b..92192eb0c5c82f540588acc4a65617fee44c0385 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Slice NRM - version: 18.8.0 + version: 19.2.0 description: >- OAS 3.0.1 specification of the Slice NRM @ 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -31,8 +31,10 @@ components: - NOT_SUPPORTED - BETWEEN_BS_AND_UE - BETWEEN_BS_AND_UE_AND_UE_AND_UE + readOnly: true PositioningAvailability: type: array + uniqueItems: true items: type: string enum: @@ -42,6 +44,9 @@ components: - AECID - HYBRID_POSITIONING - NET_RTK + readOnly: true + minItems: 1 + maxItems: 6 PredictionFrequency: type: string enum: @@ -69,14 +74,20 @@ components: enum: - CHARACTER - SCALABILITY + readOnly: true Tagging: type: array + readOnly: true + uniqueItems: true items: type: string enum: - PERFORMANCE - FUNCTION - OPERATION + minItems: 1 + maxItems: 3 + readOnly: true Exposure: type: string enum: @@ -96,6 +107,7 @@ components: enum: - NOT_SUPPORTED - SUPPORTED + readOnly: true DelayTolerance: type: object properties: @@ -119,17 +131,19 @@ components: $ref: '#/components/schemas/Support' periodicityList: type: array + uniqueItems: true items: type: integer + minItems: 1 XLThpt: type: object properties: servAttrCom: $ref: '#/components/schemas/ServAttrCom' guaThpt: - $ref: '#/components/schemas/Float' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' maxThpt: - $ref: '#/components/schemas/Float' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' MaxPktSize: type: object properties: @@ -144,6 +158,15 @@ components: $ref: '#/components/schemas/ServAttrCom' nOofPDUSessions: type: integer + MaxNumberofUEs: + type: object + properties: + servAttrCom: + $ref: '#/components/schemas/ServAttrCom' + 3GPPNoOfUEs: + type: integer + non3GPPNoOfUEs: + type: integer KPIMonitoring: type: object properties: @@ -151,8 +174,10 @@ components: $ref: '#/components/schemas/ServAttrCom' kPIList: type: array + uniqueItems: true items: type: string + readOnly: true NBIoT: type: object properties: @@ -167,6 +192,7 @@ components: $ref: '#/components/schemas/ServAttrCom' nROperatingBands: type: array + uniqueItems: true items: type: string Synchronicity: @@ -215,8 +241,10 @@ components: properties: nsInstanceId: type: string + readOnly: true nsName: type: string + readOnly: true description: type: string EmbbEEPerfReq: @@ -273,12 +301,15 @@ components: properties: secFunId: type: string + readOnly: true secFunType: type: string secRules: type: array + uniqueItems: true items: type: string + readOnly: true N6Protection: type: object properties: @@ -286,8 +317,10 @@ components: $ref: '#/components/schemas/ServAttrCom' secFuncList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SecFunc' + minItems: 1 DataNetwork: type: object properties: @@ -295,6 +328,7 @@ components: $ref: '#/components/schemas/ServAttrCom' dnnList: type: array + uniqueItems: true items: type: string DataAccess: @@ -340,14 +374,17 @@ components: $ref: '#/components/schemas/ServAttrCom' dataAccessList: type: array + uniqueItems: true items: $ref: '#/components/schemas/DataAccess' tunnellingMechanismList: type: array + uniqueItems: true items: $ref: '#/components/schemas/TunnellingMechanism' localBreakoutAllowedList: type: array + uniqueItems: true items: $ref: '#/components/schemas/LboAllowed' @@ -355,7 +392,7 @@ components: type: object properties: maxNumberofUEs: - type: integer + $ref: '#/components/schemas/MaxNumberofUEs' dLLatency: type: number uLLatency: @@ -415,7 +452,10 @@ components: uLPktDelayVariation: $ref: '#/components/schemas/Float' sliceSubnetAvailability: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' + type: array + uniqueItems: true + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' RANSliceSubnetProfile: type: object @@ -431,7 +471,7 @@ components: resourceSharingLevel: $ref: '#/components/schemas/SharingLevel' maxNumberofUEs: - type: integer + $ref: '#/components/schemas/MaxNumberofUEs' activityFactor: type: integer dLThptPerSliceSubnet: @@ -454,6 +494,7 @@ components: type: integer nROperatingBands: type: array + uniqueItems: true items: type: string delayTolerance: @@ -497,7 +538,7 @@ components: uLLatency: type: integer maxNumberofUEs: - type: integer + $ref: '#/components/schemas/MaxNumberofUEs' dLThptPerSliceSubnet: $ref: '#/components/schemas/XLThpt' dLThptPerUE: @@ -514,6 +555,7 @@ components: type: integer nROperatingBands: type: array + uniqueItems: true items: type: string sliceSimultaneousUse: @@ -571,17 +613,21 @@ components: uLPktDelayVariation: $ref: '#/components/schemas/Float' sliceSubnetAvailability: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' + type: array + uniqueItems: true + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' ServiceProfile: type: object properties: serviceProfileId: type: string + readOnly: true plmnInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList' maxNumberofUEs: - type: number + $ref: '#/components/schemas/MaxNumberofUEs' dLLatency: type: number uLLatency: @@ -630,6 +676,7 @@ components: $ref: '#/components/schemas/V2XCommModels' coverageArea: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' termDensity: @@ -667,13 +714,17 @@ components: uLPktDelayVariation: $ref: '#/components/schemas/Float' sliceAvailability: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' + type: array + uniqueItems: true + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' SliceProfile: type: object properties: sliceProfileId: type: string + readOnly: true plmnInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList' cNSliceSubnetProfile: @@ -682,11 +733,6 @@ components: $ref: '#/components/schemas/RANSliceSubnetProfile' topSliceSubnetProfile: $ref: '#/components/schemas/TopSliceSubnetProfile' - - IpAddress: - oneOf: - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' LogicalInterfaceInfo: type: object @@ -732,11 +778,13 @@ components: ServiceProfileList: type: array + uniqueItems: true items: $ref: '#/components/schemas/ServiceProfile' SliceProfileList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SliceProfile' FeasibilityResult: @@ -746,22 +794,27 @@ components: enum: - FEASIBLE - INFEASIBLE + readOnly: true InFeasibleReason: description: >- An attribute that specifies the additional reason information if the feasibility check result is infeasible.The detailed ENUM value is FFS. type: string + readOnly: true RecommendationRequest: description: >- An attribute represents MnS consumer's request for recommended network slice related requirements. - type: boolean + type: boolean + default: false RecommendedRequirements: description: >- An attribute that specifies the recommended network slicing related requirements (i.e. ServiceProfile and SliceProfile information) which can be supported by the MnS producer.. type: string + readOnly: true ResourceReservation: description: >- An attribute represents MnS consumer's requirements for resource reservation. type: boolean + default: false RequestedReservationExpiration: description: >- An attribute which specifies MnS consuner's requirements for the validity period of the resource reservation. @@ -774,6 +827,7 @@ components: - RESERVED - UNRESERVED - USED + readOnly: true ReservationExpiration: description: >- An attribute which specifies the actual validity period of the resource reservation.. @@ -782,7 +836,7 @@ components: description: >- An attribute that specifies the additional reason information if the reservation is failed. type: string - + readOnly: true ResourceIsolationRule: type: object properties: @@ -836,7 +890,7 @@ components: - type: object properties: networkSliceSubnetRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' operationalState: $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' administrativeState: @@ -844,7 +898,7 @@ components: serviceProfileList: $ref: '#/components/schemas/ServiceProfileList' networkSliceControllerRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' isolationProfileRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' @@ -858,9 +912,9 @@ components: - type: object properties: managedFunctionRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' networkSliceSubnetRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' operationalState: $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' administrativeState: @@ -880,7 +934,7 @@ components: - RAN_SLICESUBNET - CN_SLICESUBNET networkSliceSubnetControllerRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' isolationProfileRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' @@ -893,14 +947,14 @@ components: type: object properties: ipAddress: - $ref: '#/components/schemas/IpAddress' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddrRo' localLogicalInterfaceInfo: $ref: '#/components/schemas/LogicalInterfaceInfo' qosProfile: type: string epApplicationRefs: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - connectionPointRefList: + externalEndPointRefList: type: array items: $ref: '#/components/schemas/ConnectionPointInfo' @@ -915,14 +969,16 @@ components: properties: dLlatency: type: integer + readOnly: true uLlatency: type: integer + readOnly: true dLThptPerSliceSubnet: $ref: '#/components/schemas/XLThpt' uLThptPerSliceSubnet: $ref: '#/components/schemas/XLThpt' coverageAreaTAList: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/TaiList' + $ref: 'TS28541_5GcNrm.yaml#/components/schemas/TaiList' FeasibilityCheckAndReservationJob-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -971,6 +1027,7 @@ components: $ref: '#/components/schemas/ServiceProfile' serviceProfileId: type: string + readOnly: true operationalState: $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' administrativeState: @@ -980,7 +1037,7 @@ components: processMonitor: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor' networkSliceRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' NetworkSliceSubnetController-Single: allOf: @@ -1003,7 +1060,7 @@ components: processMonitor: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor' networkSliceSubnetRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' IsolationProfile-Single: allOf: @@ -1018,12 +1075,13 @@ components: $ref: '#/components/schemas/NetworkSlicingApplicability' resourceIsolationRuleList: type: array + uniqueItems: true items: $ref: '#/components/schemas/ResourceIsolationRule' networkSliceRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' networkSliceSubnetRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index f5985b380d3b5e0fe042a76a134ec72c1e6251dc..b06b18ccc5d8ca28f0d4bb117e5d7beaaa993eb4 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Common Type Definitions - version: 18.7.0 + version: 19.2.0 description: >- OAS 3.0.1 specification of common type definitions in the Generic NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -14,11 +14,23 @@ components: schemas: Float: + description: This datatype is used for writable attribute type: number format: float + FloatRo: + description: This datatype is used for readOnly attribute + type: number + format: float + readOnly: true DateTime: + description: This datatype is used for writable attribute + type: string + format: date-time + DateTimeRo: + description: This datatype is used for readOnly attribute type: string format: date-time + readOnly: true FullTime: type: string description: format (e.g., full-time) is from RFC 3339 @@ -48,28 +60,62 @@ components: maximum: 180 Dn: + description: This datatype is used for writable attribute type: string + DnRo: + description: This datatype is used for readOnly attribute + type: string + readOnly: true DnList: + description: This datatype is used for writable attribute type: array + uniqueItems: true items: $ref: '#/components/schemas/Dn' + DnListRo: + description: This datatype is used for readOnly attribute + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/DnRo' Mcc: + description: This datatype is used for writable attribut + type: string + pattern: '^[0-9]{3}$' + MccRo: + description: This datatype is used for readOnly attribute type: string pattern: '^[0-9]{3}$' + readOnly: true Mnc: + description: This datatype is used for writable attribut + type: string + pattern: '^[0-9]{2,3}$' + MncRo: + description: This datatype is used for readOnly attribute type: string pattern: '^[0-9]{2,3}$' + readOnly: true Nid: type: string pattern: '^[A-Fa-f0-9]{11}$' PlmnId: + description: This datatype is used for writable attribute type: object properties: mcc: $ref: '#/components/schemas/Mcc' mnc: $ref: '#/components/schemas/Mnc' + PlmnIdRo: + description: This datatype is used for readOnly attribute + type: object + properties: + mcc: + $ref: '#/components/schemas/MccRo' + mnc: + $ref: '#/components/schemas/MncRo' Tac: type: string pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)' @@ -80,8 +126,9 @@ components: pattern: '^[A-Fa-f0-9]{7}$' NrCellId: type: string - pattern: '^[A-Fa-f0-9]{9}$' + pattern: '^[A-Fa-f0-9]{9}$' TimeWindow: + description: This datatype is used for writable attribute oneOf: - type: object properties: @@ -96,7 +143,24 @@ components: - type: object properties: endTime: - $ref: '#/components/schemas/DateTime' + $ref: '#/components/schemas/DateTime' + TimeWindowRo: + description: This datatype is used for readOnly attribute + oneOf: + - type: object + properties: + startTime: + $ref: '#/components/schemas/DateTimeRo' + endTime: + $ref: '#/components/schemas/DateTimeRo' + - type: object + properties: + startTime: + $ref: '#/components/schemas/DateTimeRo' + - type: object + properties: + endTime: + $ref: '#/components/schemas/DateTimeRo' GeoCoordinate: type: object properties: @@ -106,16 +170,19 @@ components: $ref: '#/components/schemas/Longitude' altitude: $ref: '#/components/schemas/Float' - ConvexGeoPolygon: + GeoPolygon: type: array + uniqueItems: true items: $ref: '#/components/schemas/GeoCoordinate' - minItems: 3 + minItems: 1 GeoArea: - type: object - properties: - convexGeoPolygon: - $ref: '#/components/schemas/ConvexGeoPolygon' + oneOf: + - type: object + properties: + geoPolygon: + $ref: '#/components/schemas/GeoCoordinate' + minItems: 1 GeoAreaToCellMapping: type: object properties: @@ -131,39 +198,90 @@ components: - type: array items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' + minItems: 1 + maxItems: 8 - type: array items: $ref: '#/components/schemas/NrCellId' + minItems: 1 + maxItems: 32 - type: array items: $ref: '#/components/schemas/EutraCellId' + minItems: 1 + maxItems: 32 - type: array items: $ref: '#/components/schemas/UtraCellId' - + minItems: 1 + maxItems: 32 Fqdn: type: string + description: This datatype is used for writable attribute + pattern: '^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\.)+[A-Za-z]{2,63}\.?$' + minLength: 4 + maxLength: 253 + FqdnRo: + type: string + description: This datatype is used for readOnly attribute + pattern: '^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\.)+[A-Za-z]{2,63}\.?$' + minLength: 4 + maxLength: 253 + readOnly: true + Ipv4Addr: + description: This datatype is used for writable attribute type: string pattern: '^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$' example: '198.51.100.1' + Ipv4AddrRo: + description: This datatype is used for readOnly attribute + type: string + pattern: '^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$' + example: '198.51.100.1' + readOnly: true Ipv6Addr: + description: This datatype is used for writable attribute + type: string + allOf: + - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))$' + - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))$' + example: '2001:db8:85a3::8a2e:370:7334' + Ipv6AddrRo: + description: This datatype is used for readOnly attribute type: string allOf: - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))$' - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))$' example: '2001:db8:85a3::8a2e:370:7334' + readOnly: true Ipv6Prefix: + description: This datatype is used for writable attribute type: string allOf: - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))(\/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))$' - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))(\/.+)$' example: '2001:db8:abcd:12::0/64' + Ipv6PrefixRo: + description: This datatype is used for readOnly attribute + type: string + allOf: + - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))(\/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))$' + - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))(\/.+)$' + example: '2001:db8:abcd:12::0/64' + readOnly: true IpAddr: + description: This datatype is used for writable attribute oneOf: - $ref: '#/components/schemas/Ipv4Addr' - $ref: '#/components/schemas/Ipv6Addr' - $ref: '#/components/schemas/Ipv6Prefix' + IpAddrRo: + description: This datatype is used for readOnly attribute + oneOf: + - $ref: '#/components/schemas/Ipv4AddrRo' + - $ref: '#/components/schemas/Ipv6AddrRo' + - $ref: '#/components/schemas/Ipv6PrefixRo' HostAddr: # This definition will be deprecated, when all occurances of HostAddr # are replaced by Host. @@ -175,8 +293,17 @@ components: oneOf: - $ref: '#/components/schemas/IpAddr' - $ref: '#/components/schemas/Fqdn' + HostRo: + oneOf: + - $ref: '#/components/schemas/IpAddrRo' + - $ref: '#/components/schemas/FqdnRo' Uri: + description: This datatype is used for writable attribute + type: string + UriRo: type: string + description: This datatype is used for readOnly attribute + readOnly: true TimeInterval: type: object @@ -192,14 +319,21 @@ components: - LOCKED - UNLOCKED default: LOCKED + BasicAdministrativeState: + type: string + enum: + - LOCKED + - UNLOCKED OperationalState: type: string enum: - ENABLED - DISABLED - default: DISABLED + default: DISABLED + readOnly: true UsageState: type: string + readOnly: true enum: - IDLE - ACTIVE @@ -216,6 +350,7 @@ components: - DEGRADED - NOT_INSTALLED - LOG_FULL + readOnly: true AttributeNameValuePairSet: description: >- @@ -238,11 +373,26 @@ components: description: >- The filter format shall be compliant to Jex (TS 32.161). type: string + JexConditions: + type: string + description: >- + The value of the string shall be a Jex expression that is compliant to the + Jex conditions profile specified in clause 7.6 of TS 32.161. + JexNodeSelectionBasic: + type: string + description: >- + The value of the string shall be a Jex expression that is compliant to the + Jex basic profile specified in clause 7.4 of TS 32.161. + JexNodeSelectionAdvanced: + type: string + description: >- + The value of the string shall be a Jex expression that is compliant to the + Jex advanced profile specified in clause 7.5 of TS 32.161. SystemDN: type: string - NotificationId: type: integer + readOnly: true NotificationType: oneOf: - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmNotificationTypes' @@ -289,7 +439,7 @@ components: timeTick: type: integer filter: - $ref: '#/components/schemas/Filter' + $ref: '#/components/schemas/JexConditions' ErrorResponseGet: description: >- diff --git a/OpenAPI/TS28623_FileManagementNrm.yaml b/OpenAPI/TS28623_FileManagementNrm.yaml index a0b20fe331eb04fc84b438f734814a577bbc437c..60d44b7f0ad4c9d3c23563fd331565758cbcc096 100644 --- a/OpenAPI/TS28623_FileManagementNrm.yaml +++ b/OpenAPI/TS28623_FileManagementNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: File Management NRM - version: 18.7.0 + version: 19.2.0 description: >- OAS 3.0.1 definition of the File Management NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -12,6 +12,25 @@ externalDocs: paths: {} components: schemas: + + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-FileManagementNrm: + type: object + properties: + FileDownloadJob: + $ref: '#/components/schemas/FileDownloadJob-Multiple' + Files: + $ref: '#/components/schemas/Files-Multiple' + ManagedElement-ncO-FileManagementNrm: + type: object + properties: + FileDownloadJob: + $ref: '#/components/schemas/FileDownloadJob-Multiple' + Files: + $ref: '#/components/schemas/Files-Multiple' + #-------Definition of generic IOCs ----------# + + #-------- Definition of types----------------------------------------------------- FileDownloadJobProcessMonitor: description: >- @@ -19,10 +38,12 @@ components: for usage in the "FileDownloadJob". type: object properties: - jobId: + id: type: string + readOnly: true status: type: string + readOnly: true enum: - NOT_STARTED - RUNNING @@ -32,13 +53,16 @@ components: - CANCELLED progressPercentage: type: integer + readOnly: true minimum: 0 maximum: 100 progressStateInfo: + readOnly: true type: string resultStateInfo: oneOf: - type: string + readOnly: true enum: - NULL - UNKNOWN @@ -50,10 +74,11 @@ components: - TIMER_EXPIRED - OTHER - type: string + readOnly: true startTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' endTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' timer: type: integer @@ -90,10 +115,12 @@ components: properties: numberOfFiles: type: integer + readOnly: true jobRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' jobId: type: string + readOnly: true File: $ref: '#/components/schemas/File-Multiple' File-Single: @@ -105,13 +132,16 @@ components: type: object properties: fileLocation: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/UriRo' fileCompression: type: string + readOnly: true fileSize: type: integer + readOnly: true fileDataType: type: string + readOnly: true enum: - PERFORMANCE - TRACE @@ -119,16 +149,19 @@ components: - PROPRIETARY fileFormat: type: string + readOnly: true fileReadyTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' fileExpirationTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' fileContent: type: string + readOnly: true jobRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' jobId: type: string + readOnly: true diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 695a96fa442dded3b0438515c7de8c8ad024ef97..89d1d35e8052cbcb194a4103d78398aedb8f89fb 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Generic NRM - version: 18.7.0 + version: 19.2.0 description: >- OAS 3.0.1 definition of the Generic NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -15,11 +15,7 @@ components: #-------- Definition of types----------------------------------------------------- - RegistrationState: - type: string - enum: - - REGISTERED - - DEREGISTERED + VnfParameter: type: object properties: @@ -51,103 +47,7 @@ components: type: string powerInterface: type: string - Operation: - type: object - properties: - name: - type: string - allowedNFTypes: - $ref: '#/components/schemas/NFType' - operationSemantics: - $ref: '#/components/schemas/OperationSemantics' - NFType: - type: string - description: ' NF name defined in TS 23.501 or TS 29.510' - enum: - - NRF - - UDM - - AMF - - SMF - - AUSF - - NEF - - PCF - - SMSF - - NSSF - - UDR - - LMF - - GMLC - - 5G_EIR - - SEPP - - UPF - - N3IWF - - AF - - UDSF - - DN - - BSF - - CHF - - NWDAF - - PCSCF - - CBCF - - HSS - - UCMF - - SOR_AF - - SPAF - - MME - - SCSAS - - SCEF - - SCP - - NSSAAF - - ICSCF - - SCSCF - - DRA - - IMS_AS - - AANF - - 5G_DDNMF - - NSACF - - MFAF - - EASDF - - DCCF - - MB_SMF - - TSCTSF - - ADRF - - GBA_BSF - - CEF - - MB_UPF - - NSWOF - - PKMF - - MNPF - - SMS_GMSC - - SMS_IWMSC - - MBSF - - MBSTF - - PANF - - TNGF - - W_AGF - - TWIF - - TSN_AF - OperationSemantics: - type: string - enum: - - REQUEST_RESPONSE - - SUBSCRIBE_NOTIFY - SAP: - type: object - properties: - host: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' - port: - type: integer - NFServiceType: - type: string - enum: - - Namf_Communication - - Namf_EventExposure - - Namf_MT - - Namf_Location - - Nsmf_PDUSession - - Nsmf_EventExposure - - Others TransportProtocol: anyOf: - type: string @@ -159,26 +59,35 @@ components: properties: performanceMetrics: type: array + uniqueItems: true items: type: string + readOnly: true + minItems: 1 granularityPeriods: type: array + uniqueItems: true items: type: integer minimum: 1 + readOnly: true reportingMethods: type: array + uniqueItems: true items: type: string enum: - FILE_BASED_LOC_SET_BY_PRODUCER - FILE_BASED_LOC_SET_BY_CONSUMER - - STREAM_BASED + - STREAM_BASED + readOnly: true reportingPeriods: type: array + uniqueItems: true items: type: integer minimum: 1 + readOnly: true ReportingCtrl: oneOf: - type: object @@ -201,30 +110,14 @@ components: properties: streamTarget: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' - Scope: - oneOf: - - type: object - properties: - scopeType: - type: string - enum: - - BASE_ONLY - - BASE_ALL - - BASE_NTH_LEVEL - - BASE_SUBTREE - scopeLevel: - type: integer - - type: object - properties: - dataNodeSelector: - type: string ProcessMonitor: description: >- This data type is the "ProcessMonitor" data type without specialisations. type: object properties: - jobId: + id: type: string + readOnly: true status: type: string enum: @@ -235,38 +128,51 @@ components: - PARTIALLY_FAILED - CANCELLING - CANCELLED + readOnly: true progressPercentage: type: integer minimum: 0 maximum: 100 + readOnly: true progressStateInfo: type: string + readOnly: true resultStateInfo: type: string + readOnly: true startTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' endTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' timer: type: integer AreaScope: - oneOf: - - type: array - items: - $ref: '#/components/schemas/EutraCellId' - - type: array - items: - $ref: '#/components/schemas/NrCellId' - - type: array - items: - $ref: '#/components/schemas/Tac' - - type: array - items: - $ref: '#/components/schemas/Tai' + allOf: - type: array items: $ref: '#/components/schemas/NpnId-Type' - + minItems: 1 + - oneOf: + - type: array + items: + $ref: '#/components/schemas/EutraCellId' + minItems: 1 + maxItems: 32 + - type: array + items: + $ref: '#/components/schemas/NrCellId' + minItems: 1 + maxItems: 32 + - type: array + items: + $ref: '#/components/schemas/Tac' + minItems: 1 + maxItems: 8 + - type: array + items: + $ref: '#/components/schemas/Tai' + minItems: 1 + maxItems: 8 Tai: type: object properties: @@ -277,8 +183,8 @@ components: tac: $ref: '#/components/schemas/Tac' Tac: - type: string - pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)' + type: string + pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)' EutraCellId: type: string pattern: '^[A-Fa-f0-9]{7}$' @@ -297,16 +203,19 @@ components: properties: timeIntervals: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeInterval' - type: object properties: timeIntervals: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeInterval' daysOfWeek: type: array + uniqueItems: true items: type: string enum: @@ -317,14 +226,18 @@ components: - FRIDAY - SATURDAY - SUNDAY + minItems: 1 + maxItems: 7 - type: object properties: timeIntervals: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeInterval' daysOfMonth: type: array + uniqueItems: true items: type: integer minimum: 0 @@ -336,15 +249,15 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' cAGIdList: type: array + uniqueItems: true items: type: string - minItems: 1 maxItems: 256 nIDList: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Nid' - minItems: 1 maxItems: 16 oneOf: - required: [plmnId, cAGIdList] @@ -396,16 +309,22 @@ components: type: string setOfMcc: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc' + readOnly: true + minItems: 1 priorityLabel: type: integer + readOnly: true supportedPerfMetricGroups: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupportedPerfMetricGroup' supportedTraceMetrics: type: array + uniqueItems: true items: type: string ManagedElement-Attr: @@ -415,6 +334,7 @@ components: type: string managedElementTypeList: type: array + uniqueItems: true items: type: string userLabel: @@ -425,20 +345,25 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' vendorName: type: string + readOnly: true userDefinedState: type: string swVersion: type: string + readOnly: true priorityLabel: type: integer supportedPerfMetricGroups: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupportedPerfMetricGroup' supportedTraceMetrics: type: array + uniqueItems: true items: type: string + readOnly: true SubNetwork-ncO: type: object @@ -453,60 +378,30 @@ components: $ref: '#/components/schemas/MnsAgent-Multiple' MeContext: $ref: '#/components/schemas/MeContext-Multiple' - PerfMetricJob: - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/PerfMetricJob-Multiple' - ThresholdMonitor: - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' - TraceJob: - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple' - ManagementDataCollection: - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/ManagementDataCollection-Multiple' - NtfSubscriptionControl: - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple' AlarmList: $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmList-Single' - FileDownloadJob: - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/FileDownloadJob-Multiple' - Files: - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple' - MnsRegistry: - $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/MnsRegistry-Single' Scheduler: $ref: '#/components/schemas/Scheduler-Multiple' ConditionMonitor: $ref: '#/components/schemas/ConditionMonitor-Multiple' SupportedNotifications: $ref: '#/components/schemas/SupportedNotifications-Single' - QMCJobs: - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/QMCJob-Multiple' + ManagedElement-ncO: type: object properties: MnsAgent: $ref: '#/components/schemas/MnsAgent-Multiple' - PerfMetricJob: - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/PerfMetricJob-Multiple' - ThresholdMonitor: - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' - TraceJob: - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple' - NtfSubscriptionControl: - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple' AlarmList: $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmList-Single' - FileDownloadJob: - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/FileDownloadJob-Multiple' - Files: - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple' Scheduler: $ref: '#/components/schemas/Scheduler-Multiple' ConditionMonitor: $ref: '#/components/schemas/ConditionMonitor-Multiple' SupportedNotifications: $ref: '#/components/schemas/SupportedNotifications-Single' - QMCJobs: - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/QMCJob-Multiple' + #-------- Definition of abstract IOCs -------------------------------------------- @@ -517,20 +412,24 @@ components: type: string vnfParametersList: type: array + uniqueItems: true items: $ref: '#/components/schemas/VnfParameter' peeParametersList: type: array + uniqueItems: true items: $ref: '#/components/schemas/PeeParameter' priorityLabel: type: integer supportedPerfMetricGroups: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupportedPerfMetricGroup' supportedTraceMetrics: type: array + uniqueItems: true items: type: string EP_RP-Attr: @@ -540,8 +439,10 @@ components: type: string farEndEntity: type: string + readOnly: true supportedPerfMetricGroups: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupportedPerfMetricGroup' @@ -552,8 +453,6 @@ components: $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/PerfMetricJob-Multiple' ThresholdMonitor: $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' - ManagedNFService: - $ref: '#/components/schemas/ManagedNFService-Multiple' TraceJob: $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple' @@ -569,38 +468,15 @@ components: properties: vsDataType: type: string + readOnly: true vsDataFormatVersion: type: string + readOnly: true vsData: nullable: true VsDataContainer: $ref: '#/components/schemas/VsDataContainer-Multiple' - ManagedNFService-Single: - allOf: - - $ref: '#/components/schemas/Top' - - type: object - properties: - attributes: - type: object - properties: - userLabel: - type: string - nFServiceType: - $ref: '#/components/schemas/NFServiceType' - sAP: - $ref: '#/components/schemas/SAP' - operations: - type: array - items: - $ref: '#/components/schemas/Operation' - administrativeState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' - operationalState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' - usageState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/UsageState' - registrationState: - $ref: '#/components/schemas/RegistrationState' + ManagementNode-Single: allOf: - $ref: '#/components/schemas/Top' @@ -615,12 +491,15 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' vendorName: type: string + readOnly: true userDefinedState: type: string locationName: type: string + readOnly: true swVersion: type: string + readOnly: true MnsAgent: $ref: '#/components/schemas/MnsAgent-Multiple' MnsAgent-Single: @@ -632,7 +511,7 @@ components: type: object properties: systemDN: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' MeContext-Single: allOf: - $ref: '#/components/schemas/Top' @@ -643,6 +522,7 @@ components: properties: dnPrefix: type: string + readOnly: true Scheduler-Single: allOf: - $ref: '#/components/schemas/Top' @@ -653,11 +533,13 @@ components: properties: schedulingTimes: type: array + uniqueItems: true items: $ref: '#/components/schemas/SchedulingTime' minItems: 1 schedulerStatus: type: boolean + readOnly: true ConditionMonitor-Single: allOf: - $ref: '#/components/schemas/Top' @@ -670,6 +552,7 @@ components: type: string conditionStatus: type: boolean + readOnly: true SupportedNotifications-Single: allOf: @@ -681,16 +564,19 @@ components: properties: notificationTypes: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationType' notificationProtocols: type: array + uniqueItems: true items: type: string enum: - HTTP - HTTP_VES_ENCAPS minItems: 1 + readOnly: true SubNetwork-Single: @@ -698,6 +584,16 @@ components: - $ref: '#/components/schemas/Top' - $ref: '#/components/schemas/SubNetwork-Attr' - $ref: '#/components/schemas/SubNetwork-ncO' + - $ref: '#/components/schemas/SubNetwork-Multiple' + - $ref: '#/components/schemas/ManagedElement-Multiple' + - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/SubNetwork-ncO-FileManagementNrm' + - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/SubNetwork-ncO-PmControlNrm' + - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/SubNetwork-ncO-SubscriptionControlNrm' + - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/SubNetwork-ncO-ThresholdMonitorNrm' + - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/SubNetwork-ncO-TraceControlNrm' + - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/SubNetwork-ncO-QoEMeasurementCollectionNrm' + - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/SubNetwork-ncO-ManagementDataCollectionNrm' + - $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/SubNetwork-ncO-MnSRegistryNrm' - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/SubNetwork-ncO-MdaNrm' - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/SubNetwork-ncO-AiMlNrm' - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/SubNetwork-ncO-IntentNrm' @@ -708,12 +604,19 @@ components: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/SubNetwork-ncO-NrNrm' - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/SubNetwork-ncO-5GcNrm' - $ref: 'TS28318_DsoNrm.yaml#/components/schemas/SubNetwork-ncO-DsoNrm' + ManagedElement-Single: allOf: - $ref: '#/components/schemas/Top' - $ref: '#/components/schemas/ManagedElement-Attr' - $ref: '#/components/schemas/ManagedElement-ncO' + - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/ManagedElement-ncO-FileManagementNrm' + - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/ManagedElement-PmControlNrm' + - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/ManagedElement-ncO-SubscriptionControlNrm' + - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ManagedElement-ncO-ThresholdMonitorNrm' + - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/SubNetwork-ncO-TraceControlNrm' + - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/ManagedElement-ncO-QoEMeasurementCollectionNrm' - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/ManagedElement-ncO-MdaNrm' - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/ManagedElement-ncO-AiMlNrm' - $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/ManagedElement-ncO-CoslaNrm' @@ -737,10 +640,6 @@ components: type: array items: $ref: '#/components/schemas/VsDataContainer-Single' - ManagedNFService-Multiple: - type: array - items: - $ref: '#/components/schemas/ManagedNFService-Single' ManagementNode-Multiple: type: array items: @@ -780,7 +679,6 @@ components: - $ref: '#/components/schemas/ManagementNode-Single' - $ref: '#/components/schemas/MnsAgent-Single' - $ref: '#/components/schemas/MeContext-Single' - - $ref: '#/components/schemas/ManagedNFService-Single' - $ref: '#/components/schemas/Scheduler-Single' - $ref: '#/components/schemas/ConditionMonitor-Single' - $ref: '#/components/schemas/SupportedNotifications-Single' diff --git a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml index 185272364845362b9300407f310bcb572f64d26c..9424693be95af42123017d9866bbbe12502edb42 100644 --- a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml +++ b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Management Data Collection NRM - version: 18.6.0 + version: 19.0.0 description: >- OAS 3.0.1 definition of the Management Data Collection NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -12,6 +12,15 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-ManagementDataCollectionNrm: + type: object + properties: + ManagementDataCollection: + $ref: '#/components/schemas/ManagementDataCollection-Multiple' + + #-------Definition of generic IOCs ----------# + #-------- Definition of types----------------------------------------------------- ManagementData: diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index a5a022a43f8b576e39191a012fce3acccae370d9..299cca6577d39d78d907a77f83b37277a17eecc3 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: MnS Registry NRM - version: 18.6.0 + version: 19.2.0 description: >- OAS 3.0.1 definition of the MnS Registry NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -12,6 +12,15 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-MnSRegistryNrm: + type: object + properties: + MnsRegistry: + $ref: '#/components/schemas/MnsRegistry-Single' + + #-------Definition of generic IOCs ----------# + #-------- Definition of types----------------------------------------------------- #-------- Definition of concrete IOCs -------------------------------------------- @@ -30,18 +39,21 @@ components: properties: mnsLabel: type: string + readOnly: true mnsType: type: string + readOnly: true enum: - - ProvMnS - - FaultSupervisionMnS - - StreamingDataReportingMnS - - FileDataReportingMnS + - PROV_MNS + - FAULT_SUPERVISION_MNS + - STREAMING_DATA_REPORTING_MNS + - FILE_DATA_REPORTING_MNS mnsVersion: type: string + readOnly: true mnsAddress: description: Resource URI as defined in the relevant Technical Specification - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/UriRo' mnsScope: description: >- List of the managed object instances that can be accessed using the MnS. @@ -49,8 +61,10 @@ components: contain the DN of the SubNetwork instead of the DNs of the individual managed entities within the SubNetwork. type: array + uniqueItems: true items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' + minItems: 1 #-------- Definition of YAML arrays for name-contained IOCs ---------------------- diff --git a/OpenAPI/TS28623_PmControlNrm.yaml b/OpenAPI/TS28623_PmControlNrm.yaml index 23581d77711c1ee2a42c43c17f6ff70ea80a265c..2a3a50d1514ad671b2d9691b87a97480e811be37 100644 --- a/OpenAPI/TS28623_PmControlNrm.yaml +++ b/OpenAPI/TS28623_PmControlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: PM control NRM - version: 18.6.0 + version: 19.2.0 description: >- OAS 3.0.1 definition of the PM control NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -12,6 +12,19 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-PmControlNrm: + type: object + properties: + PerfMetricJob: + $ref: '#/components/schemas/PerfMetricJob-Multiple' + ManagedElement-PmControlNrm: + type: object + properties: + PerfMetricJob: + $ref: '#/components/schemas/PerfMetricJob-Multiple' + #-------Definition of generic IOCs ----------# + #-------- Definition of types----------------------------------------------------- @@ -34,8 +47,10 @@ components: type: string performanceMetrics: type: array + uniqueItems: true items: type: string + minItems: 1 granularityPeriod: type: integer minimum: 1 @@ -49,6 +64,8 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' reportingCtrl: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ReportingCtrl' + _linkToFiles: + type: string Files: $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple' diff --git a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml index 0ec934f5540d55813b22b2d71b2987662cf55e39..fb0eaeaf17c7ec9c5704a5cbd3373a462a172387 100644 --- a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml +++ b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: QoE Measurement Collection NRM - version: 18.7.0 + version: 19.2.0 description: >- OAS 3.0.1 definition of the QoE Measurement Collection NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -12,6 +12,20 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-QoEMeasurementCollectionNrm: + type: object + properties: + QMCJobs: + $ref: '#/components/schemas/QMCJob-Multiple' + ManagedElement-ncO-QoEMeasurementCollectionNrm: + type: object + properties: + QMCJobs: + $ref: '#/components/schemas/QMCJob-Multiple' + #-------Definition of generic IOCs ----------# + + #-------- Definition of types----------------------------------------------------- #-------- Definition of concrete IOCs -------------------------------------------- @@ -31,6 +45,7 @@ components: - VR areaScope: type: array + uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/AreaScope' qoECollectionEntityAddress: @@ -45,6 +60,7 @@ components: type: string sliceScope: type: array + uniqueItems: true items: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' qMCConfigFile: @@ -53,6 +69,7 @@ components: $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/traceReference-Type' availableRANqoEMetrics: type: array + uniqueItems: true items: type: string enum: @@ -62,6 +79,7 @@ components: maxItems: 2 mBSCommunicationServiceType: type: string + readOnly: true enum: - BROADCAST - MULTICAST diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml index 5d493262645fbb6458f8ab4ea7730cecd0226216..83b75c6b60b158f834c6bd7a703e4569a5753790 100644 --- a/OpenAPI/TS28623_SubscriptionControlNrm.yaml +++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Subscription Control NRM - version: 18.7.0 + version: 19.2.0 description: >- OAS 3.0.1 definition of the Subscription Control NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -12,19 +12,39 @@ externalDocs: paths: {} components: schemas: -#-------- Definition of types----------------------------------------------------- - Scope: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-SubscriptionControlNrm: + type: object + properties: + NtfSubscriptionControl: + $ref: '#/components/schemas/NtfSubscriptionControl-Multiple' + ManagedElement-ncO-SubscriptionControlNrm: type: object properties: - scopeType: - type: string - enum: - - BASE_ONLY - - BASE_ALL - - BASE_NTH_LEVEL - - BASE_SUBTREE - scopeLevel: - type: integer + NtfSubscriptionControl: + $ref: '#/components/schemas/NtfSubscriptionControl-Multiple' + #-------Definition of generic IOCs ----------# + +#-------- Definition of types----------------------------------------------------- + Scope: + oneOf: + - type: object + properties: + scopeType: + type: string + enum: + - BASE_ONLY + - BASE_ALL + - BASE_NTH_LEVEL + - BASE_SUBTREE + scopeLevel: + type: integer + - type: object + properties: + dataNodeSelector: + oneOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionBasic' + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionAdvanced' #-------- Definition of concrete IOCs -------------------------------------------- NtfSubscriptionControl-Single: @@ -39,12 +59,13 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' notificationTypes: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationType' scope: $ref: '#/components/schemas/Scope' notificationFilter: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexConditions' HeartbeatControl: $ref: '#/components/schemas/HeartbeatControl-Single' HeartbeatControl-Single: diff --git a/OpenAPI/TS28623_ThresholdMonitorNrm.yaml b/OpenAPI/TS28623_ThresholdMonitorNrm.yaml index d4fd1aac13b8626765a66fec90517223ecfea802..6479b1f5c9dd4676152fe1fe1061f919e1ebb0fa 100644 --- a/OpenAPI/TS28623_ThresholdMonitorNrm.yaml +++ b/OpenAPI/TS28623_ThresholdMonitorNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Threshold Monitor NRM - version: 18.2.0 + version: 19.2.0 description: >- OAS 3.0.1 definition of the Threshold Monitor NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -12,14 +12,29 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-ThresholdMonitorNrm: + type: object + properties: + ThresholdMonitor: + $ref: '#/components/schemas/ThresholdMonitor-Multiple' + ManagedElement-ncO-ThresholdMonitorNrm: + type: object + properties: + ThresholdMonitor: + $ref: '#/components/schemas/ThresholdMonitor-Multiple' + #-------Definition of generic IOCs ----------# + #-------- Definition of types----------------------------------------------------- ThresholdInfo: type: object properties: performanceMetrics: type: array + uniqueItems: true items: type: string + minItems: 1 thresholdDirection: type: string enum: @@ -53,8 +68,10 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' thresholdInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/ThresholdInfo' + minItems: 1 monitorGranularityPeriod: type: integer minimum: 1 diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 0d09284e0e6357c9c2f8d90966a5e65af059ba66..d7ceac452bf0dfc16b16849a028703e0b5a0091b 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Trace Control NRM - version: 18.7.0 + version: 19.2.0 description: >- OAS 3.0.1 definition of the Trace Control NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -12,6 +12,19 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-TraceControlNrm: + type: object + properties: + TraceJob: + $ref: '#/components/schemas/TraceJob-Multiple' + ManagedElement-ncO-TraceControlNrm: + type: object + properties: + TraceJob: + $ref: '#/components/schemas/TraceJob-Multiple' + #-------Definition of generic IOCs ----------# + #-------- Definition of types used in Trace control NRM fragment------------------ jobType-Type: @@ -40,8 +53,8 @@ components: type: string enum: - A - - Iu-CS - - Mc + - IU-CS + - MC - MAP-G - MAP-B - MAP-E @@ -54,33 +67,33 @@ components: items: type: string enum: - - Mc - - Nb-UP - - Iu-UP + - MC + - NB-UP + - IU-UP RNCInterfaces: type: array items: type: string enum: - - Iu-CS - - Iu-PS - - Iur - - Iub - - Uu + - IU-CS + - IU-PS + - IUR + - IUB + - UU SGSNInterfaces: type: array items: type: string enum: - - Gb - - Iu-PS - - Gn - - MAP-Gr - - MAP-Gd - - MAP-Gf - - Ge - - Gs - - S6d + - GB + - IU-PS + - GN + - MAP-GR + - MAP-GD + - MAP-GF + - GE + - GS + - S6D - S4 - S3 - S13 @@ -89,34 +102,34 @@ components: items: type: string enum: - - Gn - - Gi - - Gmb + - GN + - GI + - GMB S-CSCFInterfaces: type: array items: type: string enum: - - Mw - - Mg - - Mr - - Mi + - MW + - MG + - MR + - MI P-CSCFInterfaces: type: array items: type: string enum: - - Gm - - Mw + - GM + - MW I-CSCFInterfaces: type: array items: type: string enum: - - Cx - - Dx - - Mg - - Mw + - CX + - DX + - MG + - MW MRFCInterfaces: type: array items: @@ -129,42 +142,42 @@ components: items: type: string enum: - - Mg - - Mj - - Mn + - MG + - MJ + - MN IBCFInterfaces: type: array items: type: string enum: - - Ix - - Mx + - IX + - MX E-CSCFInterfaces: type: array items: type: string enum: - - Mw - - Ml - - Mm - - Mi/Mg + - MW + - ML + - MM + - MI/MG BGCFInterfaces: type: array items: type: string enum: - - Mi - - Mj - - Mk + - MI + - MJ + - MK ASInterfaces: type: array items: type: string enum: - - Dh - - Sh + - DH + - SH - ISC - - Ut + - UT HSSInterfaces: type: array items: @@ -172,12 +185,12 @@ components: enum: - MAP-C - MAP-D - - Gc - - Gr - - Cx - - S6d - - S6a - - Sh + - GC + - GR + - CX + - S6D + - S6A + - SH - N70 - N71 - NU1 @@ -188,13 +201,13 @@ components: enum: - MAP-F - S13 - - MAP-Gf + - MAP-GF BM-SCInterfaces: type: array items: type: string enum: - - Gmb + - GMB MMEInterfaces: type: array items: @@ -202,7 +215,7 @@ components: enum: - S1-MME - S3 - - S6a + - S6A - S10 - S11 - S13 @@ -215,20 +228,20 @@ components: - S5 - S8 - S11 - - Gxc + - GXC PDN_GWInterfaces: type: array items: type: string enum: - - S2a - - S2b - - S2c + - S2A + - S2B + - S2C - S5 - - S6b - - Gx + - S6B + - GX - S8 - - SGi + - SGI eNBInterfaces: type: array items: @@ -243,7 +256,7 @@ components: enum: - S1-MME - X2 - - Uu + - UU - F1-C - E1 AMFInterfaces: @@ -261,6 +274,8 @@ components: - N20 - N22 - N26 + - N41 + - N42 AUSFInterfaces: type: array items: @@ -297,6 +312,7 @@ components: - N5 - N7 - N15 + - N28 SMFInterfaces: type: array items: @@ -307,6 +323,10 @@ components: - N10 - N11 - S5-C + - N16 + - N16a + - N38 + - N40 SMSFInterfaces: type: array items: @@ -336,16 +356,16 @@ components: type: string enum: - NG-C - - Xn-C - - Uu + - XN-C + - UU gNB-CU-CPInterfaces: type: array items: type: string enum: - NG-C - - Xn-C - - Uu + - XN-C + - UU - F1-C - E1 - X2-C @@ -365,6 +385,7 @@ components: listOfNeTypes-Type: description: The Network Element types where Trace Session activation is needed. See 3GPP TS 32.422 clause 5.4 for additional details. type: array + uniqueItems: true items: type: string enum: @@ -399,16 +420,13 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc' mnc: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc' - required: - - mcc - - mnc listOfTraceMetrics: description: The trace metrics to be reported. See 3GPP TS 32.422 clause 10 for additional details. type: array + uniqueItems: true items: type: string - traceDepth-Type: description: Specifies how detailed information should be recorded in the Network Element. The Trace Depth is a paremeter for Trace Session level, i.e., the Trace Depth is the same for all of the NEs to be traced in the same Trace Session. See 3GPP TS 32.422 clause 5.3 for additional details. @@ -432,10 +450,6 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc' traceId: type: string - required: - - mcc - - mnc - - traceId traceReportingFormat-Type: type: string @@ -459,19 +473,16 @@ components: - UTRAN_CELL - E-UTRAN_CELL - NG-RAN_CELL - - eNB + - ENB - RNC - - gNB + - GNB - SUPI TargetIdValue: type: string - required: - - TargetIdType - - TargetIdValue triggeringEvents-Type: type: object - description: Specifies when to start a Trace Recording Session and which message shall be recorded first, when to stop a Trace Recording Session and which message shall be recorded last respectively. See 3GPP TS 32.422 clause 5.1 for additional detials. + description: Specifies when to start a Trace Recording Session and which message shall be recorded first, when to stop a Trace Recording Session and which message shall be recorded last respectively. See 3GPP TS 32.422 clause 5.1 for additional details. properties: MSC_SERVER: type: array @@ -480,7 +491,7 @@ components: enum: - MO_MT_CALLS - MO_MT_SMS - - LU_IMSIattach_IMSIdetach + - LU_IMSIATTACH_IMSIDETACH - HANDOVER - SS SGSN: @@ -488,10 +499,10 @@ components: items: type: string enum: - - PDPcontext + - PDPCONTEXT - MO_MT_SMS - - RAU_GPRSattach_GPRSdetach - - MBMScontext + - RAU_GPRSATTACH_GPRSDETACH + - MBMSCONTEXT MGW: type: array items: @@ -503,129 +514,134 @@ components: items: type: string enum: - - PDPcontext - - MBMScontext + - PDPCONTEXT + - MBMSCONTEXT IMS: type: array items: type: string enum: - - SIPsession_StandaloneTransaction + - SIPSESSION_STANDALONETRANSACTION BM_SC: type: array items: type: string enum: - - MBMSactivation + - MBMSACTIVATION MME: type: array items: type: string enum: - - UEinitiatedPDNconnectivityRequest - - ServiceRequest - - InitialAttach_TAU_Detach - - UEinitiatedPDNdisconnection - - BearerActivationModificationDeletion - - Handover + - UE_INITIATEDPDN_CONNECTIVITY_REQUEST + - SERVICE_REQUEST + - INITIALATTACH_TAU_DETACH + - UE_INITIATEDPDN_DISCONNECTION + - BEAR_ACTIVIATION_MODIFICATION_DELETION + - HANDOVER SGW: type: array items: type: string enum: - - PDNconnectionCreation - - PDNconnectionTermination - - BearerActivationModificationDeletion + - PDN_CONNECTION_CREATION + - PDN_CONNECTION_TERMINATION + - BEAR_ACTIVATION_MODIFICATION_DELETION PGW: type: array items: type: string enum: - - PDNconnectionCreation - - PDNconnectionTermination - - BearerActivationModificationDeletion + - PDN_CONNECTION_CREATION + - PDN_CONNECTION_TERMINATION + - BEAR_ACTIVATION_MODIFICATION_DELETION AMF: type: array items: type: string enum: - - Registration - - ServiceRequest - - Handover - - UEderegistration - - NetworkDeregistration - - UEMobilityFromEPC - - UEMobilityToEPC + - REGISTRATION + - SERVICE_REQUEST + - HANDOVER + - UE_DEREGISTRATION + - NETWORK_DEREGISTRATION + - UE_MOBILITY_FROM_EPC + - UE_MOBILITY_TO_EPC + - CONVERGED_CHARGING_SERVICE SMF: type: array items: type: string enum: - - PDUsessionEstablishment - - PDUsessionModification - - PDUsessionRelease - - PDUsessionUPactivationDeactivation - - MobilityBtw3gppAndN3gppTo5GC - - MobilityFromEpc + - PDU_SESSION_ESTABLISHMENT + - PDU_SESSION_MODIFICATION + - PDU_SESSIOON_RELEASE + - PDU_SESSION_UP_ACTIVATION_DEACTIVATION + - MOBILITY_BTW_3GPP_AND_N3GPP_TO_5GC + - MOBILITY_FROM_EPC + - MOBILITY_BTW_ISMF_OR_VSMF + - CONVERGED_CHARGING_SERVICE + - OFFLINE_ONLY_CHARGING PCF: type: array items: type: string enum: - - AMpolicy - - SMpolicy - - Authorization - - BDTpolicy + - AM_POLICY + - SM_POLICY + - AUTHORIZATION + - BDT_POLICY + - SPENDING_LIMIT_CONTROL UPF: type: array items: type: string enum: - - N4Session + - N4SESSION AUSF: type: array items: type: string enum: - - UEauthentication + - UE_AUTHENTICATION NEF: type: array items: type: string enum: - - EventExposure - - PFDmanagement - - ParameterProvision - - Trigger + - EVENT_EXPOSURE + - PFD_MANAGEMENT + - PARAMETER_PROVISION + - TRIGGER NRF: type: array items: type: string enum: - - NFmanagement - - NFdiscovery + - NF_MANAGEMEENT + - NF_DISCOVERY NSSF: type: array items: type: string enum: - - NSSelection + - NS_SELECTION - NSSAI SMSF: type: array items: type: string enum: - - SMservice + - SMSERVICE UDM: type: array items: type: string enum: - - UEcontext - - SubscriberData - - UEauthentication - - EventExposure + - UE_CONTEXT + - SUBSCRIBER_DATA + - UE_AUTHENTICATION + - EVENT_EXPOSURE anonymizationOfMdtData-Type: description: Specifies level of MDT anonymization. For additional details see 3GPP TS 32.422 clause 5.10.12. @@ -639,7 +655,7 @@ components: 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 - collectionPeriodRrmLte-Type: + collectionPeriodRRMLTE-Type: description: See details in 3GPP TS 32.422 clause 5.10.20. type: string enum: @@ -654,7 +670,7 @@ components: - 10240ms - 60000ms - collectionPeriodM6Lte-Type: + collectionPeriodM6LTE-Type: description: See details in 3GPP TS 32.422 clause 5.10.32. type: string enum: @@ -663,13 +679,13 @@ components: - 5120ms - 10240ms - collectionPeriodM7Lte-Type: + collectionPeriodM7LTE-Type: description: See details in 3GPP TS 32.422 clause 5.10.33. type: integer minimum: 1 maximum: 60 - collectionPeriodRrmUmts-Type: + collectionPeriodRRMUMTS-Type: description: See details in 3GPP TS 32.422 clause 5.10.21. type: string enum: @@ -682,7 +698,7 @@ components: - 4000ms - 6000ms - collectionPeriodRrmNr-Type: + collectionPeriodRRMNR-Type: description: See details in 3GPP TS 32.422 clause 5.10.30. type: string enum: @@ -692,7 +708,7 @@ components: - 10240ms - 60000ms - collectionPeriodM6Nr-Type: + collectionPeriodM6NR-Type: description: See details in 3GPP TS 32.422 clause 5.10.34. type: string enum: @@ -711,7 +727,7 @@ components: - 12min - 30min - collectionPeriodM7Nr-Type: + collectionPeriodM7NR-Type: description: See details in 3GPP TS 32.422 clause 5.10.35. type: integer minimum: 1 @@ -725,7 +741,7 @@ components: - A2_EVENT eventThreshold-Type: - description: See details in 3GPP TS 32.422 clause 5.10.7, 5.10.7a, 5.10.13 and 5.10.14. + description: See details in 3GPP TS 32.422 clause 5.10.7 (LTE/NR Event A2 RSRP, RSRQ, SINR), 5.10.13 (UMTS Event 1f) and 5.10.14 (UMTS Event 1i). type: object properties: EventThresholdRSRP: @@ -744,6 +760,10 @@ components: - type: integer minimum: 0 maximum: 127 + EventThresholdSINR: + type: integer + minimum: 0 + maximum: 127 EventThreshold1F: type: object properties: @@ -802,13 +822,16 @@ components: items: type: string enum: - - M1 - - M2 - - M3 - - M4 - - M5 - - M6 - - M7 + - M1_DL + - M2_DL + - M4_DL + - M4_UL + - M5_DL + - M5_UL + - M6_DL + - M6_UL + - M7_DL + - M7_UL - M1_EVENT_TRIGGERED - M8 - M9 @@ -872,7 +895,7 @@ components: - INFINITY eventThresholdL1-Type: - description: See details in 3GPP TS 32.422 clause 5.10.X. + description: See details in 3GPP TS 32.422 clause 5.10.36. type: object properties: RSRP: @@ -885,13 +908,13 @@ components: maximum: 127 hysteresisL1-Type: - description: See details in 3GPP TS 32.422 clause 5.10.Y. + description: See details in 3GPP TS 32.422 clause 5.10.37. type: integer minimum: 0 maximum: 30 timeToTriggerL1-Type: - description: See details in 3GPP TS 32.422 clause 5.10.Z. + description: See details in 3GPP TS 32.422 clause 5.10.38. type: string enum: - 0ms @@ -911,7 +934,7 @@ components: - 2560ms - 5120ms - measurementPeriodLte-Type: + measurementPeriodLTE-Type: description: See details in 3GPP TS 32.422 clause 5.10.23. type: string enum: @@ -921,7 +944,7 @@ components: - 10240ms - 1min - measurementPeriodUmts-Type: + measurementPeriodUMTS-Type: description: See details in 3GPP TS 32.422 clause 5.10.22. type: string enum: @@ -943,12 +966,11 @@ components: description: See details in 3GPP TS 32.422 clause 5.10.15. type: string enum: - - CPICH_EcNo + - CPICH_ECNO - CPICH_RSCP - - PathLoss - - eventThresholdUphUmts-Type: - description: See details in 3GPP TS 32.422 clause 5.10.A. + - PATHLOSS + eventThresholdUphUMTS-Type: + description: See details in 3GPP TS 32.422 clause 5.10.39. type: integer minimum: 0 maximum: 31 @@ -956,6 +978,7 @@ components: plmnList-Type: description: See details in 3GPP TS 32.422 clause 5.10.24. type: array + uniqueItems: true items: type: object properties: @@ -963,9 +986,6 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc' mnc: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc' - required: - - mcc - - mnc maxItems: 16 positioningMethod-Type: @@ -1204,6 +1224,7 @@ components: sensorInformation-Type: description: See details in 3GPP TS 32.422 clause 5.10.29. type: array + uniqueItems: true items: type: string enum: @@ -1247,6 +1268,7 @@ components: excessPacketDelayThresholds-Type: description: Array of type excessPacketDelayThreshold-Type. type: array + uniqueItems: true items: $ref: '#/components/schemas/excessPacketDelayThreshold-Type' minItems: 0 @@ -1299,26 +1321,26 @@ components: $ref: '#/components/schemas/reportInterval-Type' eventThreshold: $ref: '#/components/schemas/eventThreshold-Type' - collectionPeriodRrmLte: - $ref: '#/components/schemas/collectionPeriodRrmLte-Type' - collectionPeriodM6Lte: - $ref: '#/components/schemas/collectionPeriodM6Lte-Type' - collectionPeriodM7Lte: - $ref: '#/components/schemas/collectionPeriodM7Lte-Type' - collectionPeriodRrmUmts: - $ref: '#/components/schemas/collectionPeriodRrmUmts-Type' - collectionPeriodRrmNr: - $ref: '#/components/schemas/collectionPeriodRrmNr-Type' - collectionPeriodM6Nr: - $ref: '#/components/schemas/collectionPeriodM6Nr-Type' - collectionPeriodM7Nr: - $ref: '#/components/schemas/collectionPeriodM7Nr-Type' - eventThresholdUphUmts: - $ref: '#/components/schemas/eventThresholdUphUmts-Type' - measurementPeriodUmts: - $ref: '#/components/schemas/measurementPeriodUmts-Type' - measurementPeriodLte: - $ref: '#/components/schemas/measurementPeriodLte-Type' + collectionPeriodRRMLTE: + $ref: '#/components/schemas/collectionPeriodRRMLTE-Type' + collectionPeriodM6LTE: + $ref: '#/components/schemas/collectionPeriodM6LTE-Type' + collectionPeriodM7LTE: + $ref: '#/components/schemas/collectionPeriodM7LTE-Type' + collectionPeriodRRMUMTS: + $ref: '#/components/schemas/collectionPeriodRRMUMTS-Type' + collectionPeriodRRMNR: + $ref: '#/components/schemas/collectionPeriodRRMNR-Type' + collectionPeriodM6NR: + $ref: '#/components/schemas/collectionPeriodM6NR-Type' + collectionPeriodM7NR: + $ref: '#/components/schemas/collectionPeriodM7NR-Type' + eventThresholdUphUMTS: + $ref: '#/components/schemas/eventThresholdUphUMTS-Type' + measurementPeriodUMTS: + $ref: '#/components/schemas/measurementPeriodUMTS-Type' + measurementPeriodLTE: + $ref: '#/components/schemas/measurementPeriodLTE-Type' measurementQuantity: $ref: '#/components/schemas/measurementQuantity-Type' beamLevelMeasurement: @@ -1346,8 +1368,10 @@ components: $ref: '#/components/schemas/timeToTriggerL1-Type' mbsfnAreaList: type: array + uniqueItems: true items: $ref: '#/components/schemas/MbsfnArea' + maxItems: 8 reportType: $ref: '#/components/schemas/reportType-Type' plmnList: @@ -1355,9 +1379,14 @@ components: eventListForEventTriggeredMeasurement: $ref: '#/components/schemas/eventListForEventTriggeredMeasurement-Type' areaConfigurationForNeighCell: - $ref: '#/components/schemas/AreaConfig' + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/AreaConfig' + maxItems: 32 nPNIdentityList: type: array + uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type' @@ -1369,8 +1398,9 @@ components: $ref: '#/components/schemas/anonymizationOfMdtData-Type' areaScope: type: array + uniqueItems: true items: - $ref: '#/components/schemas/AreaScope' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/AreaScope' sensorInformation: $ref: '#/components/schemas/sensorInformation-Type' immediateMDTConfig: @@ -1383,7 +1413,10 @@ components: type: object properties: ueCoreMeasurements: - type: string + type: array + items: + type: string + minItems: 1 ueCoreMeasGranularityPeriod: type: integer nfTypeToMeasure: @@ -1396,20 +1429,29 @@ components: AreaScope: oneOf: - type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/EutraCellId' - type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/NrCellId' - type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Tac' - type: array + uniqueItems: true items: $ref: '#/components/schemas/Tai' - type: array + uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type' + - type: array + items: + $ref: '#/components/schemas/PLMNInfo' + Tai: type: object properties: @@ -1419,7 +1461,15 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc' tac: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Tac' - + PLMNInfo: + type: object + properties: + plmnId: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + sNSSAI: + type: array + items: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' AreaConfig: type: object properties: @@ -1427,8 +1477,13 @@ components: $ref: '#/components/schemas/FreqInfo' pciList: type: array + uniqueItems: true items: type: integer + minimum: 0 + maximum: 1007 + minItems: 1 + maxItems: 32 FreqInfo: description: specifies the carrier frequency and bands used in a cell. type: object @@ -1437,8 +1492,10 @@ components: type: integer freqBands: type: array + uniqueItems: true items: type: integer + minItems: 1 MbsfnArea: type: object properties: @@ -1460,6 +1517,9 @@ components: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type' listOfTraceMetrics: type: array + uniqueItems: true + items: + type: string traceReportingConsumerUri: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' traceCollectionEntityIpAddress: diff --git a/README.md b/README.md index 7ded0d216c1cc376503d336bf96c6b157f41a712..f4bd9cbd1b211ed39ced35ae1bb7aee66e6bd990 100644 --- a/README.md +++ b/README.md @@ -4,18 +4,20 @@ The Rel-16 branch represents the latest Rel-16 content approved and published af The Rel-17 branch represents the latest Rel-17 content approved and published after each TSG SA plenary. -Rel-18 branch represents the current working in progress release status. +The Rel-18 branch represents the latest Rel-18 content approved and published after each TSG SA plenary. -(c) 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). +The Rel-19 branch represents the current working in progress release status. + +(c) 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. -Branch {+Rel-18+} validation status: +Branch {+Rel-19+} validation status: [![pipeline status](https://forge.3gpp.org/rep/SA5/MnS/badges/Rel-18/pipeline.svg)](https://forge.3gpp.org/rep/SA5/MnS/commits/Rel-18) -## Data models validation +## Data models/Schema validation -The YANG data models in the present projects are validated by an automated CI agent. Learn more at: +The YANG data models and YAML Schema in the present projects are validated by an automated CI agent. Learn more at: * [Management And Orchestration APIs Wiki](https://forge.3gpp.org/rep/sa5/MnS/-/wikis/home) -* [Validation scripts repository](https://forge.3gpp.org/rep/tools/3gpp-scripts/sa5) +* [Validation scripts repository](https://forge.3gpp.org/rep/tools/3gpp-scripts/-/tree/master/sa5) diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang index 08b8fc7211dd4b505c121951bbdd93d1e606a462..4219405411fe8477bbdeb9580cdc82b835cf40e7 100755 --- a/yang-models/_3gpp-5g-common-yang-types.yang +++ b/yang-models/_3gpp-5g-common-yang-types.yang @@ -3,7 +3,6 @@ module _3gpp-5g-common-yang-types { namespace "urn:3gpp:sa5:_3gpp-5g-common-yang-types"; prefix "types5g3gpp"; - import ietf-yang-types { prefix yang; } import _3gpp-common-yang-types { prefix types3gpp; } @@ -15,6 +14,8 @@ module _3gpp-5g-common-yang-types { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2024-11-01 { reference CR-1405; } + revision 2024-10-06 { reference CR-1389; } revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-05-10 { reference CR-0916; } @@ -22,6 +23,71 @@ module _3gpp-5g-common-yang-types { revision 2020-11-05 { reference CR-0412 ; } revision 2019-10-20 { reference "Initial version."; } + grouping MappedCellIdInfoGrp { + description "This data type represents the mapping relationship between + Mapped Cell IDs and geographical areas (see clause 16.14.5 of TS 38.300"; + + list ntnGeoArea { + description "This attribute indicates a specific geographical location + mapped to Mapped Cell ID(s)."; + min-elements 1; + max-elements 1; + key idx; + leaf idx { type uint32; } + uses types3gpp:GeoAreaGrp; + } + + list mappedCellId { + description "This attribute is in format of NCGI to indicate a fixed + geographical area (See subclause 16.14.5 in TS 38.300)"; + min-elements 1; + max-elements 1; + key idx; + leaf idx { type uint32; } + uses NcgiGrp; + } + } + + grouping NcgiGrp { + description "Represents the Ncgi datatype"; + + list plmnId { + description "This attribute represents a PLMN Identity."; + min-elements 1; + max-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses types3gpp:PLMNId ; + } + + leaf nrCellId { + type string; + mandatory true; + description "This attribute represents NR Cell Identity. + It's a 36-bit string identifying an NR Cell Id as specified in + clause 9.3.1.7 of TS 38.413, in hexadecimal representation. Each + character in the string shall take a value of + '0' to '9', 'a' to 'f' or 'A' to 'F' and shall represent 4 bits. + The most significant character representing the 4 most significant + bits of the Cell Id shall appear first in the string, and the + character representing the 4 least significant bit of the + Cell Id shall appear last in the string. + + Pattern: '^[A-Fa-f0-9]{9}$' + + Example: + An NR Cell Id 0x225BD6007 shall be encoded as '225BD6007'."; + } + + leaf nId { + type string; + mandatory true; + description "Network Identity; Shall be present if PlmnIdNid identifies + an SNPN (see clauses 5.30.2.3, 5.30.2.9, 6.3.4, and 6.3.8 in + 3GPP TS 23.501."; + } + } + typedef NRTAC { type string; description "This holds the identity of the common Tracking Area Code diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index 310e71835b97e066a22d95ba86e9e3f2b67a90be..cf6b290f25dbf59c50ca436afc9c49a1e51a2ea3 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -8,7 +8,9 @@ module _3gpp-5gc-nrm-amffunction { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import ietf-inet-types { prefix inet; } + import ietf-yang-types { prefix yang; } import _3gpp-common-top { prefix top3gpp; } + import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -17,16 +19,17 @@ module _3gpp-5gc-nrm-amffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-11-01 { reference CR-1405; } + revision 2024-10-06 { reference CR-1389; } revision 2024-04-04 { reference CR-1139; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-01-07 { reference CR-0643; } revision 2020-11-06 { reference CR-0412 ; } revision 2019-10-25 { reference "S5-194457 S5-193518"; } - revision 2019-05-31 { reference "Ericsson refactoring."; } revision 2018-08-07 { reference "Initial revision"; } - - grouping GlobalRanNodeIDGrp{ + + grouping NTNGlobalRanNodeIDGrp{ list pLMNId { description "The PLMN Identifier is composed of @@ -116,14 +119,13 @@ module _3gpp-5gc-nrm-amffunction { } } - grouping satelliteBackhaulInfo{ + grouping SatelliteBackhaulInfoGrp{ description "Defines information related to satellite backhaul category and corresponding information of gNB."; reference "3GPP TS 23.501"; - list GlobalRanNodeID{ + list nTNGlobalRanNodeID{ description "Unique identifier of an NG-RAN node."; - uses GlobalRanNodeIDGrp; min-elements 1; max-elements 1; leaf GlobalRanNodeIDValue{ @@ -131,6 +133,7 @@ module _3gpp-5gc-nrm-amffunction { description "this relies on the choice of GlobalRanNodeID"; } key "GlobalRanNodeIDValue"; + uses NTNGlobalRanNodeIDGrp; } leaf satelliteBackhaulCategory{ @@ -160,20 +163,309 @@ module _3gpp-5gc-nrm-amffunction { } } + grouping GUAMInfoGrp { + description "Represents the GUAMInfo datatype."; + + list pLMNId { + description "This attribute represents a PLMN Identity."; + min-elements 1; + max-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses types3gpp:PLMNId ; + } + + leaf aMFIdentifier { + type int64; + description "The AMFI is constructed from an AMF Region ID, an + AMF Set ID and an AMF Pointer. The AMF Region ID identifies the region, + the AMF Set ID uniquely identifies the AMF Set within the AMF Region, + and the AMF Pointer uniquely identifies the AMF within the AMF Set. + (Ref. 3GPP TS 23.003)"; + } + } + + grouping N2InterfaceAmfInfoGrp { + description "Represents the N2InterfaceAmfInfo datatype."; + + leaf-list ipv4EndpointAddress { + type inet:ipv4-address; + min-elements 1; + description "This attribute represents available AMF endpoint + IPv4 address(es) for N2."; + } + + leaf-list ipv6EndpointAddress { + type inet:ipv6-address; + min-elements 1; + description "This attribute represents available AMF endpoint + IPv6 address(es) for N2."; + } + + leaf amfName { + type inet:host-name; + description "This attribute represents AMF Name FQDN as defined in + clause 28.3.2.5 of TS 23.003."; + } + } + + grouping BlockedLocationInfoGrp { + description "Repreasents the datatype BlockedLocationInfo"; + + list blockedLocation { + description "This provides the geographical location at which the PLMN + are not allowed in case of NTN."; + min-elements 1; + max-elements 1; + key "mnc mcc"; + uses types3gpp:PLMNId ; + } + + list blockedDurWindow { + description "This provides the time durations for which the PLMN are + not allowed at a given location in case of NTN"; + key idx; + leaf idx { type uint32 ; } + uses types3gpp:TimeWindowGrp; + } + + list blockedSlice { + description "This provides the slice for which the access is + not allowed at a given location in case of NTN. "; + max-elements 1; + key idx; + unique "sst sd"; + leaf idx { type uint32; } + uses types5g3gpp:SNssai; + } + } + + grouping NTNPLMNRestrictionsInfoGrp { + description "Represents the datatype NTNPLMNRestrictionsInfo"; + + list pLMNId { + description "This attribute represents a PLMN Identity."; + min-elements 1; + max-elements 1; + key "mnc mcc"; + uses types3gpp:PLMNId ; + } + + list blockedLocationInfoList { + description "This defines the information related with the location + for which the access restrictions are to be applied in case of NTN."; + key "idx"; + leaf idx { type uint32 ; } + uses BlockedLocationInfoGrp; + } + } + + grouping NtnLocationInfoGrp { + description "Represents the NtnLocationInfo datatype."; + + list location { + description "This defines the Location (geographical area) under + consideration to which the satellite coverage info belongs"; + key idx; + leaf idx { type uint32 ; } + uses types3gpp:GeoAreaGrp; + } + + list availabilityWindows { + description "This attribute defines the list of time windows at which + the satellite coverage will be available for this location. + Either availabilityWindows or nonAvailabilityWindows shall be present."; + key idx; + leaf idx { type uint32 ; } + uses types3gpp:TimeWindowGrp; + } + + list nonAvailabilityWindows { + description "This attribute defines the list of time windows at which + the satellite coverage will not be available for this location. + Either availabilityWindows or nonAvailabilityWindows shall be present."; + key idx; + leaf idx { type uint32 ; } + uses types3gpp:TimeWindowGrp; + } + } + + grouping SatelliteCoverageInfoGrp { + description "Represents the datatype SatelliteCoverageInfo"; + + leaf nRSatelliteRATtype { + type enumeration { + enum NRLEO; + enum NRMEO; + enum NRGEO; + enum NROTHERSAT; + } + description "This attribute defines the RAT Type for NR satellite + access."; + } + + list locationInfo { + description "This attribute defines the information about location and + corresponding time windows for which the satellite coverage will be + available or unavailable."; + key idx; + leaf idx { type uint32 ; } + uses NtnLocationInfoGrp; + } + } + + grouping SliceExpiryInfoGrp { + description "Represents the datatype SliceExpiryInfo"; + + list pLMNInfo { + min-elements 1; // ??? + config false; + description "It defines the PLMN(s) of a Network Function. "; + key idx; + leaf idx { type uint32 ; } + uses types5g3gpp:PLMNInfo; + } + + leaf expiryTime { + type yang:date-and-time; + config false; + description "This attribute provides information about the time at + which the slice is scheduled to be expired as it is not required + anymore. + This attribute will be set based on the sliceAvailability coming as + part of ServiceProfile."; + } + } + + grouping MappedCellIdInfoGrp { + description "Represents the datatype MappedCellIdInfo"; + + list ntnGeoArea { + description "This attribute indicates a specific geographical location + mapped to Mapped Cell ID(s)."; + min-elements 1; + max-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses types3gpp:GeoAreaGrp; + } + + list mappedCellId { + description "This attribute is in format of NCGI to indicate a fixed + geographical area (See subclause 16.14.5 in TS 38.300"; + min-elements 1; + max-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses types5g3gpp:NcgiGrp; + } + } + + grouping AmfInfoGrp { + description "Represents the data type AmfInfo."; + + leaf amfRegionId { + type int64; + mandatory true; + description "It represents the AMF Region ID, which identifies the + region. AllowedValues: defined in subclause 2.10.1 of 3GPP TS 23.003 "; + } + + leaf amfSetId { + type int64; + mandatory true; + description "It represents the AMF Set ID, which is uniquely identifies + the AMF Set within the AMF Region. + allowedValues: defined in subclause 2.10.1 of 3GPP TS 23.003"; + } + + list taiList { + min-elements 1; + description "The list of TAIs."; + key "idx"; + leaf idx { type uint32 ; } + uses types3gpp:TaiGrp; + } + + list taiRangeList { + min-elements 1; + description "The range of TAIs."; + key "idx"; + leaf idx { type uint32 ; } + uses nfp3gpp:TaiRangeGrp; + } + + list gUAMIdList { + description "List of supported Globally Unique AMF Ids (GUAMIs)."; + config false; + min-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses GUAMInfoGrp; + } + + list backupInfoAmfFailure { + description "List of GUAMIs for which the AMF acts as a backup for AMF + failure."; + min-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses GUAMInfoGrp; + } + + list backupInfoAmfRemoval { + description "List of GUAMIs for which the AMF acts as a backup for + planned AMF removal."; + min-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses GUAMInfoGrp; + } + + list n2InterfaceAmfInfo { + description "This attribute represents the N2 interface information of + the AMF. "; + max-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses N2InterfaceAmfInfoGrp; + } + + leaf amfOnboardingCapability { + type boolean; + default false; + description "This attribute indicates the AMF supports SNPN Onboarding + capability. This is used for the case of Onboarding of UEs for SNPNs + (see TS 23.501, clause 5.30.2.10). + - FALSE: AMF does not support SNPN Onboarding; + - TRUE: AMF supports SNPN Onboarding."; + } + + leaf highLatencyCom { + type boolean; + description "This attribute indicates whether the AMF supports High + Latency communication (e.g. for NR RedCap UE). This is used for CP NF + to discover AMF supporting High Latency communication (see TS 23.501, + clause 6.3.5). + - FALSE: AMF does not support High Latency communication e.g. for + NR RedCap UE; + - TRUE: AMF supports High Latency communication e.g. for NR RedCap UE;"; + } + } + grouping AMFFunctionGrp { description "Represents the AMFFunction IOC"; uses mf3gpp:ManagedFunctionGrp; - list pLMNIdList { + list pLMNInfoList { min-elements 1; - description "A list of PLMN identifiers (Mobile Country Code and Mobile - Network Code)."; - key "mcc mnc"; - uses types3gpp:PLMNId; + description "It defines the PLMN(s) of a Network Function. "; + key idx; + leaf idx { type uint32 ; } + uses types5g3gpp:PLMNInfo; } container aMFIdentifier { - //presence true; description "An AMF identifier, comprising an AMF Region ID, an AMF Set ID and an AMF Pointer."; uses types3gpp:AmfIdentifier; @@ -185,15 +477,14 @@ module _3gpp-5gc-nrm-amffunction { type inet:domain-name; } - list sNSSAIList { - min-elements 1; - description "List of S-NSSAIs the managed object is capable of supporting. - (Single Network Slice Selection Assistance Information) - An S-NSSAI has an SST (Slice/Service type) and an optional SD - (Slice Differentiator) field."; - reference "3GPP TS 23.003"; - key "sd sst"; - uses types5g3gpp:SNssai; + leaf-list cNSIIdList { + type string; + description "It is a set of NSI ID. NSI ID is an identifier for + identifying the Core Network part of a Network Slice instance when + multiple Network Slice instances of the same Network Slice are deployed, + and there is a need to differentiate between them in the 5GC. + See NSI ID definition in clause 3.1 of TS 23.501 and + subclause 6.1.6.2.7 of TS 29.531"; } list managedNFProfile { @@ -213,6 +504,39 @@ module _3gpp-5gc-nrm-amffunction { uses types5g3gpp:CommModel; } + list amfInfo { + max-elements 1; + description "This attribute represents information of an AMF + NF Instance."; + key "idx"; + leaf idx { type uint32 ; } + uses AmfInfoGrp; + } + + list nTNPLMNRestrictionsList { + description "This attribute defines the location restrictions per PLMN + that relates to non-terrestrial network access."; + key "idx"; + leaf idx { type uint32 ; } + uses NTNPLMNRestrictionsInfoGrp; + } + + list satelliteCoverageInfoList { + description "This attribute defines the information related to NR + Satellite RAT type and corresponding information of satellite coverage"; + key "idx"; + leaf idx { type uint32 ; } + uses SatelliteCoverageInfoGrp; + } + + list sliceExpiryInfo { + description "This provides information related to a network slice + validity."; + key "idx"; + leaf idx { type uint32 ; } + uses SliceExpiryInfoGrp; + } + list satelliteBackhaulInfoList{ description "Specifies a list of satellite backhaul information. It can be used by NF and NF services."; @@ -222,7 +546,7 @@ module _3gpp-5gc-nrm-amffunction { } key "GlobalRanNodeIDValue"; min-elements 1; - uses satelliteBackhaulInfo; + uses SatelliteBackhaulInfoGrp; } leaf-list mdtUserConsentReqList { @@ -243,12 +567,30 @@ module _3gpp-5gc-nrm-amffunction { Any MDT measurement, whose name is not specified in this list, is not subject to user consent at MDT activation."; } + + list mappedCellIdInfoList { + description "It provides the list of mapping between GEO area and + Mapped Cell ID."; + key "idx"; + leaf idx { type uint32 ; } + uses MappedCellIdInfoGrp; + } + + leaf aMFSetRef { + type types3gpp:DistinguishedName; + description "This is the DN of AMFSet"; + } } augment "/me3gpp:ManagedElement" { list AMFFunction { - description "5G Core AMF Function"; - reference "3GPP TS 28.541"; + description "This IOC represents the AMF functionality in 5GC. + For more information about the AMF, see 3GPP TS 23.501. + + The attribute sliceExpiryInfo is used when the validity information of + a network slice need to be configured. The attribute + sliceExpiryInfo.pLMNInfo indicates the network slice to which the + validity information applies."; key id; uses top3gpp:Top_Grp; container attributes { diff --git a/yang-models/_3gpp-5gc-nrm-anlffunction.yang b/yang-models/_3gpp-5gc-nrm-anlffunction.yang index 85673a4c7815f90dfe0f892352e1ee94b186ea80..3bb52fcdd868897c487d58d3aecf3560db79b557 100644 --- a/yang-models/_3gpp-5gc-nrm-anlffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-anlffunction.yang @@ -7,15 +7,17 @@ module _3gpp-5gc-nrm-anlffunction { import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-5gc-nrm-nwdaffunction { prefix nwdaf3gpp; } + import _3gpp-common-yang-types { prefix types3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the AnLF function in 5GC. For more information about the AnLF, see 3GPP TS 23.288. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2024-08-07 { reference CR-1331; } revision 2023-11-03 { reference "initial revision"; } grouping AnLFFunctionGrp { @@ -29,6 +31,18 @@ module _3gpp-5gc-nrm-anlffunction { config false; description "It indicates the activation status of the AnLF"; } + leaf-list mLModelRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of MLModel ¨ + (See TS 28.105)."; + config false; + } + leaf-list aIMLInferenceFunctionRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of AIMLInferenceFunction + (See TS 28.105) ."; + config false; + } } augment "/me3gpp:ManagedElement/nwdaf3gpp:NWDAFFunction" { diff --git a/yang-models/_3gpp-5gc-nrm-ep.yang b/yang-models/_3gpp-5gc-nrm-ep.yang index 803d3b134c2bb8bdd9171f312d23caf0106bb9c5..73854e5d45fa034761d8579167207f964b15d391 100755 --- a/yang-models/_3gpp-5gc-nrm-ep.yang +++ b/yang-models/_3gpp-5gc-nrm-ep.yang @@ -28,10 +28,11 @@ module _3gpp-5gc-nrm-ep { description "Defines the YANG mapping of the 5GC related endpoint Information Object Classes (IOCs) that are part of the 5G Core Network Resource Model. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2024-08-19 { reference CR-1314 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-11-18 { description "Ericsson refactoring."; @@ -179,7 +180,7 @@ module _3gpp-5gc-nrm-ep { uses eprp3gpp:EP_Common; } - grouping EP_NLGGrp { + grouping EP_NL2Grp { uses eprp3gpp:EP_Common; } @@ -312,12 +313,12 @@ module _3gpp-5gc-nrm-ep { } } - list EP_NLG { - description "Represents the EP_NLG IOC."; + list EP_NL2 { + description "Represents the EP_NL2 IOC."; key id; uses top3gpp:Top_Grp; container attributes { - uses EP_NLGGrp; + uses EP_NL2Grp; } } } diff --git a/yang-models/_3gpp-5gc-nrm-lmffunction.yang b/yang-models/_3gpp-5gc-nrm-lmffunction.yang index 6069ae5133d295ea5ef9e24c50bcb2acf088d83c..2a612372fc964b0ec67c36564e2d2f23c0eb0dcd 100755 --- a/yang-models/_3gpp-5gc-nrm-lmffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-lmffunction.yang @@ -9,28 +9,218 @@ module _3gpp-5gc-nrm-lmffunction { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-common-top { prefix top3gpp; } - + import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; } + import _3gpp-nr-nrm-ntnfunction { prefix ntn3gpp; } + organization "3gpp SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the LMF function defined in 3GPP TS 23.501. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2024-11-01 { reference CR-1405 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-25 { reference "S5-194457 S5193518"; } + revision 2019-05-15 { reference "initial revision"; } + + grouping LmfInfoGrp { + description "Represents the LmfInfo datatype."; + + leaf-list servingClientTypes { + type enumeration { + enum EMERGENCY_SERVICES { + description "External client for emergency services"; + } + enum VALUE_ADDED_SERVICES { + description "External client for value added services"; + } + enum PLMN_OPERATOR_SERVICES { + description "External client for PLMN operator services"; + } + enum LAWFUL_INTERCEPT_SERVICES { + description "External client for Lawful Intercept services"; + } + enum PLMN_OPERATOR_BROADCAST_SERVICES { + description "External client for PLMN Operator Broadcast services"; + } + enum PLMN_OPERATOR_OM { + description "External client for PLMN Operator O&M"; + } + enum PLMN_OPERATOR_ANONYMOUS_STATISTICS { + description "External client for PLMN Operator anonymous statistics"; + } + enum PLMN_OPERATOR_TARGET_MS_SERVICE_SUPPORT { + description "External client for PLMN Operator target MS service + support"; + } + } + description "This attribute represents a list of external client type(s), + e.g. emergency client. The NRF should only include this LMF instance + to NF discovery with 'client-type' query parameter indicating one of + the external client types in the list. + + Absence of this attribute means the LMF is not dedicated to serve + specific client types."; + } + + leaf lmfId { + type string; + description "This attribute represents the LMF identification. + See clause 6.1.6.3.6 TS 29.572"; + } + + leaf-list servingAccessTypes { + type enumeration { + enum 3GPP_ACCESS; + enum NON_3GPP_ACCESS; + } + min-elements 1; + description "This attribute contains the access type (3GPP_ACCESS and/or + NON_3GPP_ACCESS) supported by the SMF. + If not included, it shall be assumed the both access types are + supported."; + } + + leaf-list servingAnNodeTypes { + type enumeration { + enum GNB; + enum NG; + enum ENB; + } + min-elements 1; + description "This attribute contains the AN node type (i.e. gNB or NG-eNB) + supported by the LMF. + If not included, it shall be assumed that all AN node types are + supported."; + } + + leaf-list servingRatTypes { + type string; + min-elements 1; + description "This attribute contains the RAT type (e.g. 5G NR, eLTE or + any of the RAT Types specified for NR satellite access) supported by + the LMF. + If not included, it shall be assumed that all RAT types are supported + allowedValues: see clause 5.4.3.2 of TS 29.571"; + } + + list taiList { + description "This attribute contains TAI list that the LMF can serve. + It may contain one or more non-3GPP access TAIs. + The absence of both this attribute and the taiRangeList attribute + indicates that the LMF can be selected for any TAI in the serving + network."; + min-elements 1; + key idx; + leaf idx { type uint32; } + uses types3gpp:TaiGrp; + } + + list taiRangeList { + description "This attribute contains TAI range list that the LMF can + serve. It may contain one or more non-3GPP access TAI ranges. + The absence of both this attribute and the taiList attribute indicates + that the LMF can be selected for any TAI in the serving network."; + min-elements 1; + key idx; + leaf idx { type uint32; } + uses nfp3gpp:TaiRangeGrp; + } + + leaf-list supportedGADShapes { + type enumeration { + enum POINT { + description "indicates Ellipsoid Point"; + } + enum POINT_UNCERTAINTY_CIRCLE { + description "indicates Ellipsoid point with uncertainty circle"; + } + enum POINT_UNCERTAINTY_ELLIPSE { + description "indicates Ellipsoid point with uncertainty ellipse"; + } + enum POLYGON { + description "indicates Polygon"; + } + enum POINT_ALTITUDE { + description "indicates Ellipsoid point with altitude"; + } + enum POINT_ALTITUDE_UNCERTAINTY { + description "indicates Ellipsoid point with altitude and + uncertainty ellipsoid"; + } + enum ELLIPSOID_ARC { + description "indicates Ellipsoid Arc"; + } + enum LOCAL_2D_POINT_UNCERTAINTY_ELLIPSE { + description "indicates Local 2D point with uncertainty ellipse"; + } + enum LOCAL_3D_POINT_UNCERTAINTY_ELLIPSOID { + description "indicates Local 3D point with uncertainty ellipsoid"; + } + } + min-elements 1; + description "This attribute contains the GAD shapes supported by the LMF. + If not included, it doesn't indicate that the LMF doesn't support any + GAD shapes. + The allowedValues are: see clause 6.1.6.3.4 of TS 29.572 "; + } + } - revision 2019-05-15 { - description "initial revision"; - reference "Based on - 3GPP TS 28.541 V15.X.XX"; + grouping TrpMappingInfoGrp { + description "This data type represents the mapping relationship between + satellite and TRPs."; + + leaf satelliteId { + type string { + pattern '[0-9]{5}'; + } + mandatory true; + description "This attribute indicates satellite Id. It shall be formatted + as a fixed 5-digit string, padding with leading digits '0' to complete + a 5-digit length."; + } + + leaf-list trpIds { + type uint8 { + range 1..max; + } + description "This attribute indicates TRPs uniquely within an NG-RAN + node (see TS 38.455 clause 9.2.24). A gNB may serve several TRPs. + For NTN, a TRP may be located on board the satellite."; + } } + + grouping TrpInfoGrp { + description "This data type represents the mapping relationship between + gNB and TRPs."; + + leaf gNBId { + type uint32; + mandatory true; + description "It identifies a gNB within a PLMN. The gNB ID is part of + the NR Cell Identifier (NCI) of the gNB cells. + See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. See + 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; + } + list trpMappingInfoList { + description "This is the list of TRP mapping between satellite and TRPs."; + min-elements 1; + key idx; + leaf idx { type uint32; } + uses TrpMappingInfoGrp; + } + } + grouping LMFFunctionGrp { uses mf3gpp:ManagedFunctionGrp; list pLMNIdList { - description "List of at most six entries of PLMN Identifiers, but at least one (the primary PLMN Id). - The PLMN Identifier is composed of a Mobile Country Code (MCC) and a Mobile Network Code (MNC)."; + description "List of at most six entries of PLMN Identifiers, but at + least one (the primary PLMN Id). + The PLMN Identifier is composed of a Mobile Country Code (MCC) and a + Mobile Network Code (MNC)."; min-elements 1; max-elements 6; @@ -39,22 +229,58 @@ module _3gpp-5gc-nrm-lmffunction { } list managedNFProfile { + description "This parameter defines profile for managed NF. See TS 23.501"; key idx; min-elements 1; uses types3gpp:ManagedNFProfile; } list commModelList { + description "The attribute specifies a list of commModel. It can be used + by NF and NF services to interact with each other in 5G Core network + (see TS 23.501)"; min-elements 1; key "groupId"; uses types5g3gpp:CommModel; } + + list lmfInfo { + description "This attribute represents information of an LMF NF Instance"; + max-elements 1; + key idx; + leaf idx { type uint32; } + uses LmfInfoGrp; + } + + list mappedCellIdInfoList { + description "It provides the list of mapping between GEO area and + Mapped Cell ID."; + key idx; + leaf idx { type uint32; } + uses types5g3gpp:MappedCellIdInfoGrp; + } + + list ephemerisInfos { + description "This is the list of Ephemeris related information"; + min-elements 1; + key idx; + leaf idx { type uint32; } + uses ntn3gpp:EphemerisGrp; + } + + list trpInfoList { + description "This is the list of TRP (Transmission-Reception Point) + related information on LMF (see TS 38.305 clause 5.4.4)."; + min-elements 1; + key idx; + leaf idx { type uint32; } + uses TrpInfoGrp; + } } augment "/me3gpp:ManagedElement" { list LMFFunction { - description "5G Core LMF Function"; - reference "3GPP TS 28.541"; + description "5G Core LMF Function defined in TS 23.501"; key id; uses top3gpp:Top_Grp; container attributes { diff --git a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang index 5fe7eb7ae142767122d471d1be5edf12e3fed2bf..be566c2b307c1d9ef7ec94c7667200ad27ab9c1f 100755 --- a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang @@ -21,6 +21,7 @@ module _3gpp-5gc-nrm-nwdaffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2024-08-07 { reference CR-1329; } revision 2024-04-12 { reference CR-1218; } revision 2023-09-18 { reference CR-1043; } revision 2023-04-26 { reference CR-0916; } @@ -71,7 +72,15 @@ module _3gpp-5gc-nrm-nwdaffunction { default false; description "It indicate whether the NWDAF supports analytics metadata provisioning:"; - } + } + + leaf roamingExchange { + type boolean ; + default false; + description "It indicates whether the NWDAF + supports roaming exchange capability"; + } + } grouping MlAnalyticsInfoGrp { @@ -279,7 +288,8 @@ module _3gpp-5gc-nrm-nwdaffunction { } grouping NWDAFFunctionGrp { - description "Represents the NWDAFFunction IOC"; + description "The NWDAFFunction IOC includes attributes inherited from + ManagedFunction IOC(defined in TS 28.622)and the following attributes:"; uses mf3gpp:ManagedFunctionGrp; list pLMNInfoList { @@ -319,9 +329,10 @@ module _3gpp-5gc-nrm-nwdaffunction { key idx; min-elements 1; description "The attribute specifies a list of NetworkSliceInfo which - is defined as a datatype (see clause 5.3.95). It can be used by the - NWDAF to facilitate the data collection from OAM."; - leaf idx { + is defined as a datatype (see clause 5.3.95). It is used by an + authorized consumer, e.g. NWDAF, to facilitate the data collection + from OAM."; + leaf idx { type string; } uses NetworkSliceInfoGrp; @@ -367,6 +378,20 @@ module _3gpp-5gc-nrm-nwdaffunction { decomposition, in that case the NWDAF only supports the analytics services."; } + + leaf roamingAnalytics { + type boolean ; + config false; + description "It indicates whether the NWDAF supports + Nnwdaf_RoamingAnalytics service"; + } + + leaf roamingData { + type boolean ; + config false; + description "It indicates whether the NWDAF supports + Nnwdaf_RoamingData service"; + } } augment "/me3gpp:ManagedElement" { @@ -393,4 +418,4 @@ module _3gpp-5gc-nrm-nwdaffunction { uses mf3gpp:ManagedFunctionContainedClasses; } } -} \ No newline at end of file +} diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-5gc-nrm-stmfunction.yang new file mode 100644 index 0000000000000000000000000000000000000000..5ad40a9c23956f0141890fee8bd7e3c7f6ec707b --- /dev/null +++ b/yang-models/_3gpp-5gc-nrm-stmfunction.yang @@ -0,0 +1,103 @@ +module _3gpp-5gc-nrm-stmfunction { + yang-version 1.1; + + namespace urn:3gpp:sa5:_3gpp-5gc-nrm-stmfunction; + prefix stm3gpp; + + import _3gpp-common-top { prefix top3gpp; } + import ietf-inet-types { prefix inet; } + import _3gpp-common-yang-types { prefix types3gpp; } + + organization "3gpp SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "This IOC represents the STM function defined in 3GPP TS 28.abc. + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.abc + Signalling traffic monitoring management"; + + revision 2024-11-07 { reference "S5-247077"; } + + grouping StmCtrlGrp { + description "Represents the StmCtrl IOC."; + + leaf-list reportingNFList { + type types3gpp:DistinguishedName; + description "List of Network Function Distinguished Name, which + specifies the target network interface type to be monitored. If + this parameter is not present or it is empty, then all applicable + interface types from the target NF shall be monitored"; + } + + leaf-list networkInterfaceTypeList { + type enumeration { + enum ALL; + enum N4; + enum N5; + enum N7; + enum N8; + enum N10; + enum N11; + enum N12; + enum N13; + enum N14; + enum N15; + enum N22; + enum N58; + enum N59; + enum N80; + enum N81; + } + default ALL; + description "List of network interface type. it specifies the network + function whose signalling traffic is to be monitored. If this + parameter is not present or it is empty, then all Network Functions + within the SubNetwork or ManagedElement shall be monitored. This + parameter shall be omitted if the STM control object is specified + under a ManagedFunction. "; + reference "Clause 4.2.3 of 3GPP TS 23.501 for details on the + allowed values."; + } + + leaf stmTargetUri { + type inet:uri; + mandatory true; + description "It specifies the Uniform Resource Identifier (URI) of the STM + consumer that shall receive the monitored signalling message copies "; + reference "Clause 4.4 of 3GPP TS 32.158"; + } + + leaf administrativeState { + default LOCKED; + type types3gpp:BasicAdministrativeState ; + description "It is used by the STM consumer to lock or unlock the + StmCtrl instance in order to stop or start the signalling traffic + monitoring"; + } + + leaf operationalState { + config false; + mandatory true; + type types3gpp:OperationalState ; + description "It is used by STM consumer to report its working state"; + } + } + + grouping StmCtrlSubTree { + description "Contains classes that manage Signalling traffic monitoring + management"; + + list StmCtrl { + description "This IOC represents the STM Control and Configuration + parameters of a particular STM controlling. It can be + name-contained by SubNetwork, ManagedElement, or ManagedFunction."; + + key id; + uses top3gpp:Top_Grp ; + container attributes { + uses StmCtrlGrp ; + } + + } + } +} \ No newline at end of file diff --git a/yang-models/_3gpp-common-filemanagement.yang b/yang-models/_3gpp-common-filemanagement.yang index 1e03291afae984f4b8f63e2155f954999b59d817..4ead4f89a6e0625b0e1ccf761db14d008e32c9d3 100644 --- a/yang-models/_3gpp-common-filemanagement.yang +++ b/yang-models/_3gpp-common-filemanagement.yang @@ -8,6 +8,7 @@ module _3gpp-common-filemanagement { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } + import ietf-inet-types { prefix inet; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -17,6 +18,7 @@ module _3gpp-common-filemanagement { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM)"; + revision 2024-11-07 { reference CR-0474 ; } revision 2023-09-18 { reference CR-0271 ; } revision 2023-02-14 { reference CR-0234; } revision 2022-10-24 { reference CR-0196; } @@ -52,12 +54,22 @@ module _3gpp-common-filemanagement { uses top3gpp:Top_Grp; leaf fileLocation { - description "Provides the location of a file. - allowedValues: File URI (See RFC 8089)"; - mandatory true; - type string; + type inet:uri; yext3gpp:notNotifyable; yext3gpp:inVariant; + description "Location of the file incl. the file transfer protocol, + and the file name for the case the file content cannot be retrieved + by reading the 'fileContent' attribute. + + The allowed file transfer protocols are: + - sftp + - ftpes + - https + + Examples: + 'sftp://companyA.com/datastore/fileName.xml', + 'https://companyA.com/ManagedElement=1/Files=1/File=1' + "; } leaf notificationRecipientAddress { diff --git a/yang-models/_3gpp-common-files.yang b/yang-models/_3gpp-common-files.yang index 9317e769fee47aff7c2d02622f000e10b3b99ecd..726292a70f38a5df337c789802c4ac3a423f4c90 100644 --- a/yang-models/_3gpp-common-files.yang +++ b/yang-models/_3gpp-common-files.yang @@ -24,7 +24,7 @@ module _3gpp-common-files { Generic Network Resource Model (NRM) Integration Reference Point (IRP); Information Service (IS)"; - + revision 2024-05-11 { reference CR-0362 ; } revision 2023-09-18 { reference CR-0271 ; } revision 2022-09-28 { reference CR-0191; } diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index 233aa6f4a2ab338201ffe86eab7eb0c679110085..d8ab19d689ff5645c2dd7342f8eb687ed2f528bc 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -12,6 +12,8 @@ module _3gpp-common-managed-element { import _3gpp-common-files { prefix files3gpp; } import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; } import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; } + import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; } + import _3gpp-5gc-nrm-stmfunction { prefix stm3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -33,6 +35,8 @@ module _3gpp-common-managed-element { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2024-11-19 { reference "Add STM"; } + revision 2024-10-01 { reference "CR-0437,CR-0438" ; } revision 2024-01-30 { reference CR-0328 ; } revision 2023-11-14 { reference CR-0305 ; } revision 2023-09-18 { reference CR-0271 ; } @@ -49,6 +53,10 @@ module _3gpp-common-managed-element { revision 2019-06-17 { reference " S5-203316"; } revision 2019-05-08 { reference "Initial revision"; } + feature ECMappingRuleUnderManagedElement { + description "ECMappingRule shall be contained under ManagedElement."; + } + feature EcmConnectionInfoUnderManagedElement { description "The EcmConnectionInfo shall be contained under ManagedElement"; @@ -120,6 +128,10 @@ module _3gpp-common-managed-element { ManagedElement."; } + feature StmCtrlUnderManagedElement { + description "The StmCtrlSubtree shall be contained under ManagedElement"; + } + grouping ManagedElement_Grp { description "Abstract class representing telecommunications resources. An ME communicates with a manager (directly or indirectly) for the @@ -304,5 +316,13 @@ module _3gpp-common-managed-element { uses econn3gpp:EcmConnectionInfoSubtree { if-feature EcmConnectionInfoUnderManagedElement; } + + uses ecmap3gpp:NRECMappingRuleSubtree { + if-feature ECMappingRuleUnderManagedElement; + } + + uses stm3gpp:StmCtrlSubTree { + if-feature StmCtrlUnderManagedElement ; + } } } diff --git a/yang-models/_3gpp-common-managed-function.yang b/yang-models/_3gpp-common-managed-function.yang index ea4390cc348f5167fb4501fdb3fcbd70c2a9d8a3..8a012d09aa0f6cada86062adb7e56cb9a3892fc5 100755 --- a/yang-models/_3gpp-common-managed-function.yang +++ b/yang-models/_3gpp-common-managed-function.yang @@ -8,6 +8,7 @@ module _3gpp-common-managed-function { import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-measurements { prefix meas3gpp; } import _3gpp-common-trace { prefix trace3gpp; } + import _3gpp-5gc-nrm-stmfunction { prefix stm3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -24,6 +25,7 @@ module _3gpp-common-managed-function { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2024-11-19 { reference "Add STM"; } revision 2024-02-24 { reference CR-0346; } revision 2023-09-18 { reference CR-0271; } revision 2023-04-26 { reference CR-0250; } @@ -48,6 +50,10 @@ module _3gpp-common-managed-function { feature TraceUnderManagedFunction { description "The TraceSubtree shall be contained under ManagedFunction"; } + + feature StmCtrlUnderManagedFunction { + description "The StmCtrlSubtree shall be contained under ManagedFunction"; + } grouping OperationGrp { description "This data type represents an operation."; @@ -351,5 +357,9 @@ module _3gpp-common-managed-function { uses trace3gpp:TraceSubtree { if-feature TraceUnderManagedFunction ; } + + uses stm3gpp:StmCtrlSubTree { + if-feature StmCtrlUnderManagedFunction ; + } } } \ No newline at end of file diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index e2cf97b8a3e946cdd07ac0bab2727e1d71104a5c..28c838a66b8557f551b6b49f884716fee2acb754 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -56,6 +56,7 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; + revision 2024-11-01 { reference CR-0488; } revision 2024-05-06 { reference CR-0359; } revision 2024-02-24 { reference CR-0346; } revision 2023-11-18 { reference "CR-0299 CR-0305"; } @@ -187,6 +188,7 @@ module _3gpp-common-measurements { grouping SupportedPerfMetricGroupGrp { list SupportedPerfMetricGroups { config false; + key idx; description "Captures a group of supported performance metrics and associated parameters related to their production and reporting. A SupportedPerfMetricGroup attribute which is part of an MOI may @@ -195,6 +197,8 @@ module _3gpp-common-measurements { can specify supported metrics for contained ManagedFunctions like a GNBDUFunction."; + leaf idx { type uint32; } + leaf-list performanceMetrics { type string; min-elements 1; diff --git a/yang-models/_3gpp-common-mecontext.yang b/yang-models/_3gpp-common-mecontext.yang new file mode 100644 index 0000000000000000000000000000000000000000..ed183f1a72c8e880e788732bdd3edac15487e6f5 --- /dev/null +++ b/yang-models/_3gpp-common-mecontext.yang @@ -0,0 +1,82 @@ +module _3gpp-common-mecontext { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-common-mecontext"; + prefix "mectx3gpp"; + + import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-top { prefix top3gpp; } + import _3gpp-common-subnetwork { prefix subnet3gpp; } + import ietf-yang-schema-mount { prefix yangmnt; } + + organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + + description "Defines basic MeContext which will be augmented by other IOCs + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.623 + Generic Network Resource Model (NRM) + Integration Reference Point (IRP); + Solution Set (SS) definitions + + 3GPP TS 28.622 + Generic Network Resource Model (NRM) + Integration Reference Point (IRP); + Information Service (IS)"; + + revision 2024-07-17 { reference "CR-0381 CR-0382 CR-0383"; } + + grouping MeContextGrp { + description "Represents the MeContext IOC."; + + leaf dnPrefix { + type types3gpp:DistinguishedName; + description "It carries the DN Prefix information or no information. + The instance of MeContext is the local root instance of the MIB. + Otherwise the attribute shall be absent or carry no information."; + reference "Annex C of 32.300 "; + } + } + + augment "/subnet3gpp:SubNetwork" { + list Mecontext { + description "This IOC is introduced for naming purposes. It may support + creation of unique DNs in scenarios when some MEs have the same RDNs due + to the fact that they have been manufacturer pre-configured. + + If some MEs have the same RDNs (for the above mentioned reason) and they + are contained in the same SubNetwork instance, some measure shall be + taken in order to assure the global uniqueness of DNs for all IOC + instances under those MEs. One way could be to set different dnPrefix + for those NEs, but that would require either that: + + a) all LDNs or DNs are locally modified using the new dnPrefix for the + upper portion of the DNs, or + b) a mapping (translation) of the old LDNs or DNs to the new DNs every + time they are used externally, e.g. in alarm notifications. + + As both the two alternatives above may involve unacceptable drawbacks + (as the old RDNs for the MEs then would have to be changed or mapped to + new values), using MeContext offers a new alternative to resolve the DN + creation. Using MeContext as part of the naming tree (and thus the DN) + means that the dnPrefix, including a unique MeContext for each ME, may + be directly concatenated with the LDNs, without any need to change or + map the existing ME RDNs to new values. + + MeContext have 0..N instances. It may exist even if no SubNetwork exists. + Every instance of MeContext contains exactly one ManagedElement during + steady-state operations."; + + key id; + uses top3gpp:Top_Grp; + container attributes { + uses MeContextGrp; + } + + yangmnt:mount-point children-of-MeContext { + description "Mountpoint for ManagedElement"; + reference "RFC8528 YANG Schema Mount"; + } + } + } +} \ No newline at end of file diff --git a/yang-models/_3gpp-common-qmcjob.yang b/yang-models/_3gpp-common-qmcjob.yang index bd46a03606da1467dab086579490ab72717290d9..b69cd9a19050efdd05e5d1ddd6b3c5fa0bf16351 100644 --- a/yang-models/_3gpp-common-qmcjob.yang +++ b/yang-models/_3gpp-common-qmcjob.yang @@ -27,6 +27,8 @@ module _3gpp-common-qmcjob { Integration Reference Point (IRP); Information Service (IS)"; + revision 2024-11-05 { reference CR-0480; } + revision 2024-04-04 { reference CR-0334; } revision 2023-09-18 { reference CR-0271 ; } revision 2023-02-14 { reference "CR-0234"; } revision 2022-11-04 { reference "CR-0215"; } @@ -49,12 +51,8 @@ module _3gpp-common-qmcjob { list areaScope { key "idx"; leaf idx { type uint32 ; } - description "It specifies the area where data shall be collected. - List of eNB/list of gNB/eNB/gNB for RLF or RCEF. - List of cells or Tracking Area for QMC. - Cell, TA, LA, RA are mutually exclusive."; - reference "Clause 5.10.2 of 3GPP TS 32.422"; - + description "It defines the area scope of QoE, which is specified + in clause 5.4 of TS 28.405."; uses trace3gpp:AreaScopeGrp; } @@ -149,6 +147,14 @@ module _3gpp-common-qmcjob { to the gNB. This parameter is optional and is valid for NR only."; } + leaf mBSCommunicationServiceType { + type enumeration { + enum BROADCAST; + enum MULTICAST; + } + description "This attribute indicates which type of MBS communication + service the QoE measurement configuration pertains to."; + } } grouping QMCJobSubTree { @@ -173,12 +179,15 @@ module _3gpp-common-qmcjob { producer. For details of Management Based Activation of QoE Measurement Collection see clause 4.5 and for details of Signalling Based Activation of QoE Measurement Collection see clause 4.6 of TS 28.405. - The attributes areaScope and pLMNTarget are only relevant when + The attribute pLMNTarget is only relevant when Management Based Activation is used and the attribute qoETarget is only relevant when Signalling Based Activation is used. All other attributes are common for both Management Based Activation and Signalling Based Activation. + The areaScope attribute defines the area scope of QoE, which is + specified in clause 5.4 of TS 28.405. + When a MnS consumer wishes to deactivate a QMC Job, the MnS consumer shall delete the corresponding QMCJob instance. NOTE: If the reporting is ongoing, when a request to delete a QMCJob @@ -189,43 +198,7 @@ module _3gpp-common-qmcjob { jobId can be used to associate multiple QMCJob instances. For example, it is possible to configure the same jobId value for multiple QMCJob instances required to produce the data (e.g. Streaming services and - MTSI reports) for a specific network analysis. - The QoE Measurement Collection provides capability for collecting QoE - information from: - - UEs which are in the specified area in case of Management Based - Activation or - - an individual UE in case of Signalling Based Activation. - The QoE Measurement Collection enables collection of application layer - from the UE for specified end user service type. The supported service - types are: - - Streaming services, see TS 26.247. - - MTSI services, see TS 26.114. - - VR services, see TS 26.118. - A QMCJob instance represents the job for collecting QoE measurements - according to the job parameters. For details of the QoE measurement - collection configuration parameters see clause 5 of TS 28.405. A QMCJob - instance can be name-contained by SubNetwork or ManagedElement. - A QMC Job is activated by creating a QMCJob object instance in the - MnS producer. For details of Management Based Activation of QoE - Measurement Collection see clause 4.5 and for details of Signalling - Based Activation of QoE Measurement Collection see - clause 4.6 of TS 28.405. The attributes areaScope and pLMNTarget are - only relevant when Management Based Activation is used and the - attribute qoETarget is only relevant when Signalling Based Activation - is used. All other attributes are common for both Management Based - Activation and Signalling Based Activation. - - When a MnS consumer wishes to deactivate a QMC Job, the MnS consumer - shall delete the corresponding QMCJob instance. - NOTE: If the reporting is ongoing, when a request to delete a QMCJob - instance is received, the reporting does not end. The QMCJob instance - is deleted, when the last reporting for the QMC Job expires. - - The jobId attribute presents the job identifier of a QMCJob instance. - The jobId can be used to associate multiple QMCJob instances. - example, it is possible to configure the same jobId value for multiple - QMCJob instances required to produce the data (e.g. Streaming services - and MTSI reports) for a specific network analysis."; + MTSI reports) for a specific network analysis."; key id; uses top3gpp:Top_Grp; container attributes { diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang index d6d5f7010369bea58396611428ff5c1ba8e16cca..59868e1c63d5702a691e9a06ce65f4a149cf88c2 100755 --- a/yang-models/_3gpp-common-subnetwork.yang +++ b/yang-models/_3gpp-common-subnetwork.yang @@ -13,6 +13,8 @@ module _3gpp-common-subnetwork { import _3gpp-common-files { prefix files3gpp; } import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; } import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; } + import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; } + import _3gpp-5gc-nrm-stmfunction { prefix stm3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -33,6 +35,8 @@ module _3gpp-common-subnetwork { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2024-11-19 { reference "Add STM"; } + revision 2024-01-30 { reference CR-1337 ; } revision 2024-01-30 { reference CR-0328 ; } revision 2023-11-14 { reference CR-0305 ; } revision 2023-09-18 { reference CR-0271 ; } @@ -61,6 +65,10 @@ module _3gpp-common-subnetwork { reference "Initial revision"; } + feature ECMappingRuleUnderSubNetwork { + description "ECMappingRule shall be contained under SubNetwork."; + } + feature EcmConnectionInfoUnderSubNetwork { description "The EcmConnectionInfo shall be contained under Subnetwork"; @@ -136,6 +144,10 @@ module _3gpp-common-subnetwork { feature. The CESManagementFunction shall be contained under SubNetwork."; } + feature StmCtrlUnderManagedSubNetwork { + description "The StmCtrlSubtree shall be contained under SubNetwork"; + } + grouping Domain_Grp { description "A domain is a partition of instances of managed entities such that : @@ -264,11 +276,18 @@ module _3gpp-common-subnetwork { if-feature EcmConnectionInfoUnderSubNetwork; } + uses ecmap3gpp:NRECMappingRuleSubtree { + if-feature EcmConnectionInfoUnderSubNetwork; + } + + uses stm3gpp:StmCtrlSubTree { + if-feature StmCtrlUnderManagedSubNetwork ; + } + yangmnt:mount-point children-of-SubNetwork { description "Mountpoint for ManagedElement"; reference "RFC8528 YANG Schema Mount"; } - // augment external parts here } -} \ No newline at end of file +} diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index af5327945e8450ecca88f1883152f8593ac64667..3c0f3401b434d6138b2b0e8409e37bdef7d460b1 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -4,10 +4,11 @@ module _3gpp-common-trace { prefix "trace3gpp"; import _3gpp-common-top { prefix top3gpp; } - import _3gpp-common-yang-types {prefix types3gpp; } import _3gpp-common-yang-extensions {prefix yext3gpp; } import ietf-inet-types { prefix inet; } import _3gpp-common-files { prefix files3gpp; } + import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-5g-common-yang-types {prefix types5g3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -25,6 +26,10 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; + revision 2024-11-07 { reference "CR-0480"; } + revision 2024-10-01 { reference "CR-0457"; } + revision 2024-08-13 { reference "CR-0387 CR-0377"; } + revision 2024-08-07 { reference "CR-0405 CR-0421 CR-0379"; } revision 2024-05-12 { reference "CR-0401"; } revision 2024-05-06 { reference CR-0359; } revision 2024-04-06 { reference "CR-0342"; } @@ -104,21 +109,7 @@ module _3gpp-common-trace { } grouping AreaScopeGrp { - description "Represents the AreaScope dataType. - This <> defines the area scope of MDT. - The Area Scope parameter in LTE and NR is either: - - list of Cells, identified by E-UTRAN-CGI or NG-RAN CGI. - Maximum 32 CGI can be defined. - - list of Tracking Area, identified by TAC. - Maximum of 8 TAC can be defined. - - list of Tracking Area Identity, identified by TAC with - associated plmn-Identity perTAC-List containing the - PLMN identity for each TAC. Maximum of 8 TAI can be defined. - The Area Scope parameter in NR can also contain: - - list of NPN-IDs in NR. It is either a list of PNI-NPNs - identified by CAG ID with associated plmn-Identity or a - list of SNPNs identified by Network ID with associated - plmn-Identity ."; + description "This <> defines an area scope."; choice AreaScopeChoice { leaf-list eutraCellIdList { @@ -128,11 +119,11 @@ module _3gpp-common-trace { description "List of E-UTRAN cells identified by E-UTRAN-CGI"; } - leaf-list utraCellIdList { + leaf-list nrCellIdList { type string; min-elements 1; max-elements 32; - description "List of UTRAN cells identified by UTRAN CGI"; + description "List of NR cells identified by NG-RAN CGI"; } leaf-list tacList { @@ -142,6 +133,15 @@ module _3gpp-common-trace { description "Tracking Area Code list"; } + list sliceIdList { + description "Network Slice Id list"; + key idx; + uses types5g3gpp:PLMNInfo; + min-elements 1; + max-elements 16384; + leaf idx { type string; } + } + list taiList { description "Tracking Area Identity list"; key idx; @@ -690,15 +690,15 @@ module _3gpp-common-trace { -reportingTrigger: conditional for M1 in LTE or NR and M1/M2 in UMTS, -eventThreshold: conditional for A2 event reporting or A2 event triggered periodic reporting, - -collectionPeriodRrmNR: conditional for M4 and M5 in NR, + -collectionPeriodRRMNR: conditional for M4 and M5 in NR, -collectionPeriodM6NR: conditional for M6 in NR, -collectionPeriodM7NR: conditional for M7 in NR, - -collectionPeriodRrmLte (conditional for M3 in LTE), + -collectionPeriodRRMLTE (conditional for M3 in LTE), -measurementPeriodLTE (conditional for M4 and M5 in LTE), - -collectionPeriodM6Lte (conditional for M6 in LTE), - -collectionPeriodM7Lte (conditional for M7 in LTE), - -collectionPeriodRrmUmts (conditional for M4 and M5 in UMTS), - -measurementPeriodUmts (conditional for M6 and M7 in UMTS), + -collectionPeriodM6LTE (conditional for M6 in LTE), + -collectionPeriodM7LTE (conditional for M7 in LTE), + -collectionPeriodRRMUMTS (conditional for M4 and M5 in UMTS), + -measurementPeriodUMTS (conditional for M6 and M7 in UMTS), -measurementQuantity (conditional for 1F event reporting), -beamLevelMeasurement (conditional for M1 in NR), -excessPacketDelayThresholds (conditional for M6 UL measurement in NR). @@ -736,8 +736,8 @@ module _3gpp-common-trace { configuration, see TS 38.321, TS 36.321 and TS 38.331, TS 36.331. For measurement M4 in UMTS, reporting is either according to RRM configuration, see TS 25.321 and TS 25.331 or periodic or event - triggered periodic using parameter collectionPeriodRrmUmts and - eventThresholdUphUmts. + triggered periodic using parameter collectionPeriodRRMUMTS and + eventThresholdUphUMTS. - For measurement M3 in UMTS, the reporting is done upon availability, see TS 37.320. @@ -745,10 +745,10 @@ module _3gpp-common-trace { - For measurements M4, M5, M6 and M7 in NR, for measurements M3, M4, M5, M6 and M7 in LTE and for measurements M5, M6 and M7 in UMTS periodical reporting is applied. The configurable parameter - is the interval between two measurements (collectionPeriodRrmNr, - collectionPeriodM6NR, collectionPeriodM7Nr, collectionPeriodRrmLte, - measurementPeriodLte, collectionPeriodM6Lte, collectionPeriodM7Lte, - collectionPeriodRrmUmts, measurementPeriodUmts). If no collection + is the interval between two measurements (collectionPeriodRRMNR, + collectionPeriodM6NR, collectionPeriodM7NR, collectionPeriodRRMLTE, + measurementPeriodLte, collectionPeriodM6LTE, collectionPeriodM7LTE, + collectionPeriodRRMUMTS, measurementPeriodUMTS). If no collection period is configured for M5 in UMTS, all available measurements are logged according to RRM configuration."; @@ -844,7 +844,7 @@ module _3gpp-common-trace { reference "Clauses 5.10.7 and 5.10.7a of 3GPP TS 32.422"; } - leaf collectionPeriodRrmNr { + leaf collectionPeriodRRMNR { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { @@ -858,7 +858,7 @@ module _3gpp-common-trace { reference "Clause 5.10.30 of 3GPP TS 32.422"; } - leaf collectionPeriodM6Nr { + leaf collectionPeriodM6NR { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type enumeration { @@ -884,7 +884,7 @@ module _3gpp-common-trace { reference "clause 5.10.34 of TS 32.422"; } - leaf collectionPeriodM7Nr { + leaf collectionPeriodM7NR { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { @@ -897,7 +897,7 @@ module _3gpp-common-trace { reference "clause 5.10.35 of TS 32.422"; } - leaf collectionPeriodRrmLte { + leaf collectionPeriodRRMLTE { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { @@ -928,7 +928,7 @@ module _3gpp-common-trace { reference "Clause 5.10.23 of 3GPP TS 32.422"; } - leaf collectionPeriodM6Lte { + leaf collectionPeriodM6LTE { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { @@ -942,7 +942,7 @@ module _3gpp-common-trace { reference "Clause 5.10.32 of TS 32.422 "; } - leaf collectionPeriodM7Lte { + leaf collectionPeriodM7LTE { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint16 { @@ -955,7 +955,7 @@ module _3gpp-common-trace { reference "Clause 5.10.33 of TS 32.422 ."; } - leaf eventThresholdUphUmts { + leaf eventThresholdUphUMTS { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint16 { @@ -968,7 +968,7 @@ module _3gpp-common-trace { reference "5.10.39 of TS 32.422"; } - leaf collectionPeriodRrmUmts { + leaf collectionPeriodRRMUMTS { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { @@ -983,7 +983,7 @@ module _3gpp-common-trace { reference "Clause 5.10.21 of 3GPP TS 32.422"; } - leaf measurementPeriodUmts { + leaf measurementPeriodUMTS { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + 'or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { @@ -1439,14 +1439,10 @@ module _3gpp-common-trace { description "Defines the configuration parameters of IOC TraceJob which are specific for MDT. The attribute anonymizationOfMdtData specifies the level of anonymization - of MDT data. The optional attribute areaScope allows to - specify the area in terms of cells or Tracking Area/Routing - Area/Location area where the MDT data collection shall take - place. In case of RLF_REPORT_ONLY and RCEF_REPORT_ONLY the - optional attribute areaScope allows to specify the eNB or list - of eNBs or gNB or list of gNBs where the reports should be - collected. The optional attribute sensorInformation allows to - specify the sensor information to include. Based on the value + of MDT data. The attribute areaScope defines the area scope + of MDT, which is specified in clause 5.10.2 of TS 32.422. + The optional attribute sensorInformation allows to specify + the sensor information to include. Based on the value configured for attribute jobType in IOC TraceJob, the attributes immediateMdtConfig or loggedMdtConfig are available: In case of IMMEDIATE_MDT_ONLY or IMMEDIATE_MDT_AND_TRACE the attribute @@ -1467,21 +1463,9 @@ module _3gpp-common-trace { list areaScope { key "idx"; leaf idx { type uint32 ; } - description "It specifies the area where data shall be collected. - List of eNB/list of gNB/eNB/gNB for RLF or RCEF. - - List of cells/TA/LA/RA for signaling based MDT or management - based Logged MDT. - - List of cells for management based Immediate MDT. - - List of NPN IDs for management based MDT. - - Cell, TA, LA, RA are mutually exclusive. - - This attribute shall be present if MDT is supported."; - reference "Clause 5.10.2 of 3GPP TS 32.422"; - + description "It specifies the area where data shall be collected. "; + min-elements 0; + max-elements 1; uses AreaScopeGrp; } @@ -1519,22 +1503,49 @@ module _3gpp-common-trace { leaf idx { type string; } uses LoggedMdtConfigGrp; } + + leaf mNOnly { + type boolean; + default false; + description "Specifies whether the MDT configuration is for MN + only or not. The value FALSE means the MDT configuration is for + both MN and SN. The value TRUE means the MDT configuration is + for MN only."; + } } - grouping UEMeasConfigGrp { - description "Represents the UEMeasConfig dataType. + grouping UECoreMeasConfigGrp { + description "Represents the UECoreMeasConfig dataType. This <> defines the aconfiguration parameters of IOC TraceJob which are specific for UE level measurements collection."; - leaf-list ueMeasurements { + leaf-list ueCoreMeasurements { type string; - description "It specifies the List of UE level measurements."; - } + min-elements 1; + description "List of 5GC UE level measurements identified by name. - leaf ueMeasGranularityPeriod { + The list may include 5GC UE level measurements defined in TS 28.558, + or vendor specific measurements. + + For 5GC UE level measurements defined in TS 28.558, the name is + constructed as follows: + - 'family.measurementName.subcounter' for measurement type with + specified subcounter + - 'family.measurementName.ALL' for measurement type with all supported + subcounters + - 'family.measurementName' for measurement type without subcounters + - 'family' for measurement family, including all measurement types and + the associated subcounters under this family. + For non-3GPP specified 5GC UE level measurements the name is defined + elsewhere."; + } + + leaf ueCoreMeasGranularityPeriod { type uint32; - description "It specifies the Granularity period used to produce UE level - measurements. The period is defined in milliseconds (ms)."; + mandatory true; + units milliseconds; + description "It specifies the Granularity period used to produce 5GC UE + level measurements. The period is defined in milliseconds (ms)."; } leaf nfTypeToMeasure { @@ -1574,18 +1585,33 @@ module _3gpp-common-trace { enum TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS; enum IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS; enum TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS; + enum RRC_REPORT; } default TRACE_ONLY; description "Specifies the MDT mode and it specifies also whether the TraceJob represents only MDT, Logged MBSFN MDT, Trace, or 5GC UE level measurement collection, or any combination - of Trace, immediate MDT and 5GC UE level measurement collection. - The attribute is applicable for Trace, MDT, RCEF and + of Trace, immediate MDT and 5GC UE level measurement collection or RRC + reporting. + The attribute is applicable for Trace, MDT, RCEF, RRC and RLF reporting, and 5GC UE level measurement collection."; reference "Clause 5.9a of 3GPP TS 32.422 for additional details on the allowed values."; } - + leaf-list rrcReportType { + type enumeration { + enum RLF_REPORT; + enum RCEF_REPORT; + enum SHR; + enum SPR; + enum MHI; + enum RA_REPORT; + } + description "Specifies the RRC reports requested. "; + reference "Clause 5.14 of 3GPP TS 32.422 for additional details on the + allowed values."; + } + list pLMNTarget { key "mcc mnc"; description "Specifies which PLMN that the subscriber of the session to @@ -1614,6 +1640,7 @@ module _3gpp-common-trace { values."; } + leaf traceReportingConsumerUri { when '../traceReportingFormat = "STREAMING"'; type inet:uri; @@ -1703,22 +1730,22 @@ module _3gpp-common-trace { ManagedEntity playing a role of ServinGWFunction. In case of signaling based Trace/MDT, the traceTarget attribute shall - be able to carry (IMSI or IMEI(SV)or SUPI), the mDTAreaScope attribute + be able to carry (IMSI or IMEI(SV)or SUPI), the areaScope attribute shall be able to carry a list of (cell or E-UtranCell or NRCellDU or TA/LA/RA). In case of management based Immediate MDT, the traceTarget attribute - shall be null value, the mDTAreaScope attribute shall carry a list of + shall be null value, the areaScope attribute shall carry a list of (Utrancell or E-UtranCell or NRCellDU). In case of management based Logged MDT, the traceTarget attribute shall carry an eBs or a RNC or gNBs. The Logged MDT should be initiated - on the specified eNB or RNC or gNB in traceTarget. The mDTAreaScope + on the specified eNB or RNC or gNB in traceTarget. The areaScope attribute shall carry a list of (Utrancell or E-UtranCell or NRCellDU or TA/LA/RA). In case of RLF reporting, or RCEF reporting, the traceTarget - attribute shall be null value, the mDTAreaScope attribute shall carry + attribute shall be null value, the areaScope attribute shall carry one or list of eNBs/gNBs"; reference "3GPP TS 32.422"; } @@ -1752,7 +1779,7 @@ module _3gpp-common-trace { leaf idx { type string; } } - list ueMeasConfig { + list ueCoreMeasConfig { when '../jobType = "5GC_UE_LEVEL_MEASUREMENTS_ONLY"' + ' or ../jobType = "TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS"' + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' @@ -1761,7 +1788,7 @@ module _3gpp-common-trace { key idx; description "5GC UE level measurements config"; max-elements 1; - uses UEMeasConfigGrp; + uses UECoreMeasConfigGrp; leaf idx { type string; } } @@ -1839,10 +1866,10 @@ module _3gpp-common-trace { only, RCEF reports only and Logged MBSFN MDT, the configuration parameters of attribute mdtConfig or a subset of these shall be applied. In case of UE measurements only, the configuration parameters - of attribute ueMeasConfig shall be applied. In case of any combination - of Trace, Immediate MDT, Trace and UE measurements, the configuration - parameters of the corresponding attributes traceConfig, mdtConfig and - ueMeasConfig are applicable. + of attribute ueCoreMeasConfig shall be applied. In case of any + combination of Trace, Immediate MDT, Trace and UE measurements, the + configuration parameters of the corresponding attributes traceConfig, + mdtConfig and ueCoreMeasConfig are applicable. Creation and deletion of TraceJob instances by MnS consumers is optional; when not supported, the TraceJob instances may be created diff --git a/yang-models/_3gpp-common-util.yang b/yang-models/_3gpp-common-util.yang index 6e58aa14fcdb98d95f9dc78d1c20c12fcf447b0c..040b1f5010b4f58a92f84213d95b09651f0fd7b4 100644 --- a/yang-models/_3gpp-common-util.yang +++ b/yang-models/_3gpp-common-util.yang @@ -3,6 +3,7 @@ module _3gpp-common-util { namespace urn:3gpp:sa5:_3gpp-common-util; prefix "util3gpp"; + import ietf-yang-types { prefix yang ; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-yang-types { prefix types3gpp ; } import _3gpp-common-managed-element { prefix me3gpp ; } @@ -16,6 +17,8 @@ module _3gpp-common-util { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623"; + revision 2024-08-13 { reference CR-0387; } + revision 2024-07-30 { reference "CR-0392 CR-0393"; } revision 2024-05-06 { reference CR-0359; } feature SchedulerUnderManagedElement { @@ -88,7 +91,7 @@ module _3gpp-common-util { must 'not(../daysOfWeek)'; description "Shall be present in case of Monthly periodicity, otherwise not"; - type types3gpp:DaysOfMonth; + type types3gpp:DateMonthDay; } } } @@ -157,14 +160,22 @@ module _3gpp-common-util { description "Represents the Scheduler IOC."; leaf condition { - type string { + type yang:xpath1.0 { length 1..max; } mandatory true; - description "Logical expression of one or several condition(s). - - A restricted XPath may be used. The definition of the exact syntax - is not ready yet. + description "A logical condition containing an XPath expression. + The leaf contains an XPath 1.0 string with the following restrictions + - The accessible tree is the full Network Resource Model + - The root node is the list representing the top level MOI + (E.g. ManagedElement) + - In the accessible tree, all leafs and leaf-lists with default values + in use exist + - The data tree has no concept of document order except when 'ordered-by + user' is declared. + - The set of variable bindings is empty. + - The function library is the core function library defined in XPATH + - Namespaces should be ignored when evaluating the expression An empty string is not allowed."; } @@ -173,7 +184,8 @@ module _3gpp-common-util { type boolean; mandatory true; config false; - description "Switches between TRUE and FALSE depending upon whether the + description "The boolean result of the condition. + Switches between TRUE and FALSE depending upon whether the configured constraints are fulfilled or not."; } } diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 3c8b9c7a4299b5a44b8c95d7387ee78f145d5767..37fadf04ae1a6b6cc2e6a054ad55945c6be5fb6c 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -16,6 +16,8 @@ module _3gpp-common-yang-types { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623"; + revision 2024-11-01 { reference CR-0463; } + revision 2024-08-13 { reference CR-0387; } revision 2024-05-18 { reference CR-0359; } revision 2024-04-12 { reference CR-0346; } revision 2023-11-06 { reference CR-0305; } @@ -94,7 +96,13 @@ module _3gpp-common-yang-types { } } - typedef DaysOfMonth { + typedef DateMonth { + type uint8 { + range 0..12; + } + } + + typedef DateMonthDay { type uint8 { range 0..31; } @@ -103,6 +111,22 @@ module _3gpp-common-yang-types { typedef FullTime { type yang:time-with-zone-offset; } + + grouping DayInYearGrp { + description "This <> represents a day in a year."; + + leaf month { + description "It indicates the month in a year."; + type DateMonth; + mandatory true; + } + + leaf monthDay { + description "It indicates the day in a month."; + type DateMonthDay; + mandatory true; + } + } grouping TimeWindowGrp { leaf startTime { @@ -597,10 +621,24 @@ module _3gpp-common-yang-types { } typedef Tac { - type int32 { - range 0..16777215 ; + type string { + pattern "([A-Fa-f0-9]{4})|([A-Fa-f0-9]{6})" ; } - description "Tracking Area Code"; + description "Tracking Area Code + 2 or 3-octet string identifying a tracking area code as specified in + clause 9.3.3.10 of 3GPP TS 38.413 [34], in hexadecimal representation. + Each character in the string shall take a value of + '0' to '9', 'a' to 'f' or 'A' to 'F' and shall represent 4 bits. + The most significant character representing the 4 most significant + bits of the TAC shall appear first in the string, and the character + representing the 4 least significant bit of the TAC shall appear last + in the string. + + pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)' + + Examples: + A legacy TAC 0x4305 shall be encoded as '4305'. + An extended TAC 0x63F84B shall be encoded as '63F84B'"; reference "TS 23.003 clause 19.4.2.3"; } @@ -609,7 +647,7 @@ module _3gpp-common-yang-types { as specified in clause 28.6 of TS 23.003, clause 8.2 of TS 38.300 and clause 9.3.3.11 of TS 38.413. It is composed of the PLMN identifier (PLMN-Id, which is composed of the MCC and MNC) and - the Tracking Area Code (TAC). "; + the Tracking Area Code (TAC)."; list plmnId { description "PLMN Identity."; min-elements 1; @@ -618,7 +656,11 @@ module _3gpp-common-yang-types { uses types3gpp:PLMNId; } - leaf tac { type Tac; } + leaf tac { + type Tac; + mandatory true; + description "Tracking Area Code"; + } } grouping GeoCoordinateGrp { diff --git a/yang-models/_3gpp-nr-nrm-bwpset.yang b/yang-models/_3gpp-nr-nrm-bwpset.yang index 8b92fa0830d6b4781ca08bb88898ff86dcdf3816..42f70035212a2ab845bd2b59cb4743ac73b9007a 100644 --- a/yang-models/_3gpp-nr-nrm-bwpset.yang +++ b/yang-models/_3gpp-nr-nrm-bwpset.yang @@ -12,10 +12,12 @@ module _3gpp-nr-nrm-bwpset { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the BWPSet Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-11-01 { reference CR-1405 ; } + revision 2024-08-19 { reference CR-1314 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-06-29 { reference CR-0756 ; } @@ -26,7 +28,7 @@ module _3gpp-nr-nrm-bwpset { } augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" { - list BWPList { + list BWPSet { description "Represents a bandwidth part (BWP) set."; key id; uses top3gpp:Top_Grp; diff --git a/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang index d0afa896a0b344c48d377034a81cd083c922a14e..3260d36464076d4366b6329e4609a637028a6e17 100755 --- a/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang +++ b/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang @@ -3,45 +3,47 @@ module _3gpp-nr-nrm-danrmanagementfunction { namespace "urn:3gpp:sa5:_3gpp-nr-nrm-danrmanagementfunction"; prefix "danrmanagementfunction3gpp"; - import _3gpp-common-top { prefix top3gpp; } import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } - - organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Defines the YANG mapping of the DANRManagementFunction Information Object Class - (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + description "Defines the YANG mapping of the DANRManagementFunction IOC + that is part of the NR Network Resource Model (NRM). + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-08-19 { reference CR-1314 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2020-05-08 { reference S5-203316; } - grouping DANRManagementFunctionGrp { description "Represents the DANRManagementFunction IOC."; - reference "3GPP TS 28.541"; - uses top3gpp:Top_Grp; leaf intrasystemANRManagementSwitch { - description "This attribute determines whether the intra-system ANR function is activated or deactivated."; - type boolean; + description "This attribute determines whether the intra-system ANR + function is activated or deactivated."; + type boolean; } leaf intersystemANRManagementSwitch { - description "This attribute determines whether the inter-system ANR function is activated or deactivated."; - type boolean; + description "This attribute determines whether the inter-system ANR + function is activated or deactivated."; + type boolean; } - - } augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction" { - if-feature gnbcucp3gpp:DANRManagementFunction; - uses DANRManagementFunctionGrp; + list DANRManagementFunction { + description "This IOC contains attributes to support the D-SON function + of ANR Management (See clause 6.4.1.3 in TS 28.313 ."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses DANRManagementFunctionGrp; + } + } } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang index c1201b7fb86b6614652e30739d8e91c3946fd25f..2e1e5bbaaa072d4935e52545b70639b18c9bab06 100755 --- a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang +++ b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang @@ -9,16 +9,18 @@ module _3gpp-nr-nrm-desmanagementfunction { import _3gpp-nr-nrm-nrcellcu { prefix nrcellcu3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-5g-common-yang-types { prefix type5g3gpp; } + import _3gpp-common-yang-types { prefix types3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the DESManagementFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-08-07 { reference CR-1331; } revision 2023-09-18 { reference CR-1043 ; } revision 2021-08-05 { reference S5-214053/CR-0518; } revision 2020-05-08 { reference S5-203316; } @@ -139,7 +141,19 @@ module _3gpp-nr-nrm-desmanagementfunction { enum yes; enum no; } - } + } + leaf-list mLModelRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of MLModel ¨ + (See TS 28.105])."; + config false; + } + leaf-list aIMLInferenceFunctionRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of AIMLInferenceFunction + (See TS 28.105) ."; + config false; + } } grouping EsNotAllowedTimePeriodGrp { @@ -200,4 +214,4 @@ module _3gpp-nr-nrm-desmanagementfunction { if-feature subnet3gpp:DESManagementFunction; uses DESManagementFunctionSubtree; } -} \ No newline at end of file +} diff --git a/yang-models/_3gpp-nr-nrm-dlbofunction.yang b/yang-models/_3gpp-nr-nrm-dlbofunction.yang index 6ae29fa509cee4528a3574f313fd42fbc271729a..9a3781a4560d67a36d6166e52f75fda55627799f 100644 --- a/yang-models/_3gpp-nr-nrm-dlbofunction.yang +++ b/yang-models/_3gpp-nr-nrm-dlbofunction.yang @@ -8,16 +8,18 @@ module _3gpp-nr-nrm-dlbofunction { import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-nr-nrm-nrcellcu { prefix nrcellcu3gpp; } + import _3gpp-common-yang-types { prefix types3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the DLBOFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-08-07 { reference CR-1331; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-03-25 { reference "CR-0683"; } revision 2021-10-22 { reference "CR-0577"; } @@ -68,7 +70,18 @@ module _3gpp-nr-nrm-dlbofunction { type int32 { range "0..604800"; } units "1"; } - + leaf-list mLModelRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of MLModel ¨ + (See TS 28.105)."; + config false; + } + leaf-list aIMLInferenceFunctionRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of AIMLInferenceFunction + (See TS 28.105) ."; + config false; + } } grouping DLBOFunctionSubtree { @@ -84,7 +97,7 @@ module _3gpp-nr-nrm-dlbofunction { uses top3gpp:Top_Grp; container attributes { uses DLBOFunctionGrp; - } + } } } @@ -101,4 +114,4 @@ module _3gpp-nr-nrm-dlbofunction { if-feature DLBOUnderSubNetwork; uses DLBOFunctionSubtree; } -} \ No newline at end of file +} diff --git a/yang-models/_3gpp-nr-nrm-dmrofunction.yang b/yang-models/_3gpp-nr-nrm-dmrofunction.yang index ea6ef52b7f65c2f8ea11bfa55949b6a0400ff19e..9c1937e1d7522027358a2a7d39a830140a498d95 100755 --- a/yang-models/_3gpp-nr-nrm-dmrofunction.yang +++ b/yang-models/_3gpp-nr-nrm-dmrofunction.yang @@ -8,16 +8,18 @@ module _3gpp-nr-nrm-dmrofunction { import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-nr-nrm-nrcellcu { prefix nrcellcu3gpp; } + import _3gpp-common-yang-types { prefix types3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the DMROFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-08-07 { reference CR-1331; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-01-07 { reference CR-0633; } revision 2021-08-05 { reference S5-214053/CR-0518; } @@ -64,6 +66,18 @@ module _3gpp-nr-nrm-dmrofunction { description "This attribute determines whether the MRO function is enabled or disabled."; type boolean; + } + leaf-list mLModelRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of MLModel ¨ + (See TS 28.105)."; + config false; + } + leaf-list aIMLInferenceFunctionRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of AIMLInferenceFunction + (See TS 28.105) ."; + config false; } } @@ -101,4 +115,4 @@ module _3gpp-nr-nrm-dmrofunction { if-feature subnet3gpp:DMROFunction; uses DMROFunctionSubtree; } -} \ No newline at end of file +} diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang new file mode 100644 index 0000000000000000000000000000000000000000..ac5fbfe309e502edf1b4eea2cbf2ba2053bdee03 --- /dev/null +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -0,0 +1,56 @@ +module _3gpp-nr-nrm-ecmappingrule { + yang-version 1.1; + namespace urn:3gpp:sa5:_3gpp-nr-nrm-ecmappingrule; + prefix ecmap3gpp; + + import _3gpp-common-top { prefix top3gpp; } + + organization "3gpp SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "This IOC represents the unified mapping rule input to support + Energy Cost Index Mapping when Energy Cost Reporting. + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.541"; + + revision 2024-08-21 { reference CR-1337 ; } + + grouping NRECMappingRuleGrp { + description "Represents the unified mapping rule to support Energy Cost Mapping + when Energy Cost Reporting is supported. Can be name-contained by SubNetwork + or ManagedElement. It applies to all ManagedEntity contained by the parent."; + leaf eCMRInputMinValue { + type uint8; + description "The minimum value of to be applied + for mapping from this attribute to the energy cost."; + } + + leaf eCMRInputMaxValue { + type uint8; + description "The maximum value of to be applied + for mapping from this attribute to the energy cost."; + } + + leaf eCTimeInterval { + type uint8; + description "Time interval (in seconds) that + should be applied for collecting values of mapping + rule attribute to be used for computing the energy cost."; + units seconds; + } + } + + grouping NRECMappingRuleSubtree { + description "Helps augmenting NRECMappingRule into multiple places."; + list NRECMappingRule { + key id; + uses top3gpp:Top_Grp; + min-elements 1; + max-elements 1; + leaf idx { type uint32; } + container attributes { + uses NRECMappingRuleGrp; + } + } + } +} diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 7d8eabeec81675750634464c98f6e60d59175eb2..aaf83c7ee507585fae9ac80ae2245e30a06c35b3 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -4,6 +4,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { prefix "gnbcucp3gpp"; import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } @@ -19,6 +20,9 @@ module _3gpp-nr-nrm-gnbcucpfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-11-07 { reference "CR-1443"; } + revision 2024-08-19 { reference "CR-1405"; } + revision 2024-08-19 { reference "CR-1337 CR-1352"; } revision 2024-05-24 { reference CR-1273 ; } revision 2024-04-04 { reference CR-1139; } revision 2024-02-24 { reference CR-1218; } @@ -55,7 +59,85 @@ module _3gpp-nr-nrm-gnbcucpfunction { feature DMROFunction { description "Class representing D-SON function of MRO feature"; } - + + grouping BackhaulAddressGrp { + description "This data type represents the properties describing the + backhaul address of gNB. "; + + leaf gNBId { + type uint32 ; + mandatory true; + description "It identifies a gNB within a PLMN. The gNB ID is part of + the NR Cell Identifier (NCI) of the gNB cells."; + reference "gNB Identifier (gNB ID) of subclause 8.2 of TS 38.300. + Global gNB ID in subclause 9.3.1.6 of TS 38.413"; + } + + list tAI { + key tac; + min-elements 1; + max-elements 1; + description "Tracking Area Identity"; + reference "subclause 9.3.3.11 in TS 38.413"; + uses types3gpp:TaiGrp; + } + } + + grouping MappingSetIDBackhaulAddressGrp { + description "This data type represents the properties describing the + mapping relationship between set ID and backhaul address of gNB."; + + leaf setID { + type uint32 { + range 0..4194304; // 22 bits + } + mandatory true; + description "This specifies the set ID of a victim Set (RIM-RS1 Set) or + aggressor Set (RIM-RS2 set). (See subclause 7.4.1.6 in TS 38.211). + + allowedValues: + The bit length of the set ID is maximum 22bit."; + } + + list backhaulAddress { + description "The attribute specifies backhaulAddress which is defined as + a datatype."; + min-elements 1; + max-elements 1; + key gNBId; + uses BackhaulAddressGrp; + } + } + + grouping tceIDMappingInfoGrp { + description "This data type represents the properties describing the + mapping relationship between TCE ID, PLMN where TCE resides and + IP address of TCE."; + + leaf tceIPAddress { + type inet:ip-address; + mandatory true; + description "This attribute indicates IP address of TCE. + (See subclause 4.1.1.9.2 in TS 32.422)"; + } + + leaf tceID { + type int64; + mandatory true; + description "This attribute indicates TCE Id. + (See subclause 4.1.1.9.2 in TS 32.422)"; + } + + list pLMNTarget { + description "Indicates the PLMN where TCE resides. + (See subclauses 4.1.1.9.2 and 4.9.2 in TS 32.422)"; + min-elements 1; + max-elements 1; + key mnc; + uses types3gpp:PLMNId; + } + } + grouping GNBCUCPFunctionGrp { description "Represents the GNBCUCPFunction IOC."; reference "3GPP TS 28.541"; @@ -93,46 +175,74 @@ module _3gpp-nr-nrm-gnbcucpfunction { uses types3gpp:PLMNId; } - leaf-list x2BlockList { - type string; + list x2BlockList { description "List of nodes to which X2 connections are prohibited."; + key idx; + leaf idx {type uint32;} + uses GeNBIdGrp; } - leaf-list x2AllowList { - type string; + list x2AllowList { description "List of nodes to which X2 connections are enforced."; + key idx; + leaf idx {type uint32;} + uses GeNBIdGrp; } - leaf-list xnBlockList { - type string; + list xnBlockList { description "List of nodes to which Xn connections are prohibited."; + key idx; + leaf idx {type uint32;} + uses GgNBIdGrp; } - leaf-list xnAllowList { - type string; + list xnAllowList { description "List of nodes to which X2 connections are enforced."; + key idx; + leaf idx {type uint32;} + uses GgNBIdGrp; } - leaf-list xnHOBlockList { - type string; - description "List of nodes to which handovers over Xn are prohibited."; + list x2HOBlockList { + description "List of nodes to which handovers over X2 are prohibited."; + key idx; + leaf idx {type uint32;} + uses GeNBIdGrp; } - leaf configurable5QISetRef { - type types3gpp:DistinguishedName; - description "DN of the Configurable5QISet that the GNBCUCPFunction - supports (is associated to)."; + list xnHOBlockList { + description "List of nodes to which handovers over Xn are prohibited."; + key idx; + leaf idx {type uint32;} + uses GgNBIdGrp; } - leaf-list x2HOBlockList { - type string; - description "List of nodes to which handovers over X2 are prohibited."; + list mappingSetIDBackhaulAddressList { + description "The attribute specifies a list of mappingSetIDBackhaulAddress + which is defined as a datatype. Which is used to + retrieve the backhaul address of the victim set."; + min-elements 1; + key idx; + leaf idx {type uint32; } + uses MappingSetIDBackhaulAddressGrp; } - - leaf dynamic5QISetRef { - type types3gpp:DistinguishedName; - description "DN of the Dynamic5QISet that the GNBCUCPFunction supports - (is associated to)."; + + list tceIDMappingInfoList { + description "This attribute includes a list of TCE ID, PLMN where TCE + resides and the corresponding TCE IP address. It is used in Logged MDT + case to provide the information to the gNodeB or GNBCUCPFunction to + get the corresponding TCE IP address when there is an MDT log + received from the UE."; + min-elements 1; + key idx; + leaf idx { type uint32; } + uses tceIDMappingInfoGrp; + } + + leaf dDAPSHOControl { + type boolean; + description "This attribute determines whether the DAPS handover function + is enabled or disabled."; } leaf dCHOControl { @@ -141,12 +251,6 @@ module _3gpp-nr-nrm-gnbcucpfunction { enabled or disabled."; } - leaf dDAPSHOControl { - type boolean; - description "This attribute determines whether the DAPS handover function - is enabled or disabled."; - } - list qceIdMappingInfoList { description "List of the mapping relationship between QoE collection entity identity, PLMN where QoE collection entity resides, and the IP address of @@ -176,10 +280,37 @@ module _3gpp-nr-nrm-gnbcucpfunction { subject to user consent at MDT activation."; } + list mappedCellIdInfoList { + description "This attribute provides the list of mapping between + geographical location and Mapped Cell ID."; + key idx; + leaf idx { type uint32; } + uses types5g3gpp:MappedCellIdInfoGrp; + } + + leaf configurable5QISetRef { + type types3gpp:DistinguishedName; + description "DN of the Configurable5QISet that the GNBCUCPFunction + supports (is associated to)."; + } + + leaf dynamic5QISetRef { + type types3gpp:DistinguishedName; + description "DN of the Dynamic5QISet that the GNBCUCPFunction supports + (is associated to)."; + } + leaf ephemerisInfoSetRef { type types3gpp:DistinguishedName; description "This is the DN of EphemerisInfoSet."; } + + leaf nRECMappingRuleRef { + type types3gpp:DistinguishedName; + description "DN of a NRECMappingRule. An empty value indicates the + NRECMappingRule contained by parent, e.g. ManagedElement or + SubNetwork, applies."; + } } grouping QceIdMappingInfoGrp { @@ -206,6 +337,39 @@ module _3gpp-nr-nrm-gnbcucpfunction { } } + grouping GgNBIdGrp { + description "Represents the properties of a global gNB ID (GgNBId)."; + + uses types3gpp:PLMNId; + + leaf gnbIdLength { + type int32 {range "22..32";} + mandatory true; + description "This indicates the number of bits for encoding the gNB ID. See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; + } + + leaf gnbId { + description "Identifies a gNB within a PLMN. The gNB Identifier (gNB ID) + is part of the NR Cell Identifier (NCI) of the gNB cells."; + reference "gNB ID in 3GPP TS 38.300, Global gNB ID in 3GPP TS 38.413"; + mandatory true; + type int64 { range "0..4294967295"; } + } + } + + grouping GeNBIdGrp { + description "Represents the properties of a global eNB ID (GeNBId)."; + uses types3gpp:PLMNId; + + leaf enbId { + description "It identifies an eNB within a PLMN. The eNB ID is part of the E-UTRAN Cell Global Identifier (ECGI) of the eNB + cells."; + reference "eNB ID in 3GPP TS 36.300. Global eNB ID in 3GPP TS 36.413."; + mandatory true; + type int32 {range "0..4194303";} + } + } + augment "/me3gpp:ManagedElement" { list GNBCUCPFunction { @@ -223,4 +387,4 @@ module _3gpp-nr-nrm-gnbcucpfunction { } } } -} \ No newline at end of file +} diff --git a/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang index fed4880c9bd0f7b85ecab68ff4a7d963f8abaaeb..4238ccf3b8f8e0ec632bdd74797bccfbeb87e224 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang @@ -19,6 +19,7 @@ module _3gpp-nr-nrm-gnbcuupfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-11-01 { reference CR-1405 ; } revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } @@ -38,74 +39,6 @@ module _3gpp-nr-nrm-gnbcuupfunction { GNBCUUPFunction"; } - grouping TAIGrp { - description "Tracking Area Identity"; - - list pLMNId { - key "mcc mnc"; - description "PLMN IDs for the Tracking area"; - uses types3gpp:PLMNId; - } - - leaf nRTAC { - type types5g3gpp:NRTAC; - description "Identity of the common Tracking Area Code for the PLMNs - allowedValues: - a) It is the TAC or Extended-TAC. - b) A cell can only broadcast one TAC or Extended-TAC. - See TS 36.300, subclause 10.1.7 (PLMNID and TAC relation). - c) TAC is defined in subclause 19.4.2.3 of 3GPP TS 23.003 and - Extended-TAC is defined in subclause 9.3.1.29 of 3GPP TS 38.473. - d) For a 5G SA (Stand Alone), it has a non-null value."; - } - } - - grouping BackhaulAddressGrp { - description "Indicates the backhauladdress of gNB."; - - leaf gNBId { - type uint32 { - range "0..4294967295"; - } - description "It identifies a gNB within a PLMN. The gNB ID is part of - the NR Cell Identifier (NCI) of the gNB cells."; - reference "gNB Identifier (gNB ID) of subclause 8.2 of TS 38.300. - Global gNB ID in subclause 9.3.1.6 of TS 38.413"; - } - - list tAI { - key nRTAC; - min-elements 1; - max-elements 1; - description "Tracking Area Identity"; - reference "subclause 9.3.3.11 in TS 38.413"; - uses TAIGrp; - } - } - - grouping MappingSetIDBackhaulAddressGrp { - description "Mapping relationship between setID and backhaulAddress of gNB"; - - leaf idx { - type uint32 ; - description "ID value"; - } - - leaf setID { - type uint32; - mandatory true; - description "Indicates the setID of gNB."; - reference "Subclause 7.4.1.6 in TS 38.211"; - } - - list backhaulAddress { - key gNBId; - min-elements 1; - max-elements 1; - description "Indicates the backhauladdress of gNB."; - uses BackhaulAddressGrp; - } - } grouping GNBCUUPFunctionGrp { description "Represents the GNBCUUPFunction IOC."; reference "3GPP TS 28.541"; @@ -147,15 +80,6 @@ module _3gpp-nr-nrm-gnbcuupfunction { uses types5g3gpp:PLMNInfo; } - list mappingSetIDBackhaulAddressList { - key idx; - description "Specifies a list of mappingSetIDBackhaulAddress used to - retrieve the backhaul address of the victim set. - Must be present if Remote Interference Management function is - supported."; - uses MappingSetIDBackhaulAddressGrp; - } - leaf configurable5QISetRef { type types3gpp:DistinguishedName; description "DN of the Configurable5QISet that the GNBCUUPFunction diff --git a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang index ca3c6f76857915005eea6643e72f6704ec5703f9..2e48204b4856127c54af849c238661146cd5a8f2 100755 --- a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang @@ -18,6 +18,7 @@ module _3gpp-nr-nrm-gnbdufunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-01-24 { reference CR-1441; } revision 2024-02-24 { reference CR-1218; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } @@ -195,6 +196,12 @@ module _3gpp-nr-nrm-gnbdufunction { type types3gpp:DistinguishedName; description "DN of the Dynamic5QISet that the GNBDUFunction supports (is associated to)."; } + + leaf nRECMappingRuleRef { + type types3gpp:DistinguishedName; + description "DN of a NRECMappingRule. An empty value indicates the NRECMappingRule contained by parent, e.g. ManagedElement or SubNetwork, applies."; + } + } augment "/me3gpp:ManagedElement" {