diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index 4290465aa8cc9e9fda12f6f9b433b7448a648134..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.5.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: @@ -140,9 +167,9 @@ components: supportedMDACapabilities: $ref: '#/components/schemas/MDATypes' 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' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: 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 4bdb73a0e7787862d51903c1fd4f65846230569c..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.5.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: @@ -353,12 +401,14 @@ components: $ref: '#/components/schemas/RequestStatus' cancelRequest: type: boolean + default: FALSE suspendRequest: - type: boolean + type: boolean + default: FALSE 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' MLTestingReport-Single: allOf: @@ -371,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: @@ -391,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: @@ -406,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: @@ -425,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: @@ -444,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: @@ -455,19 +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/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' usedByFunctionRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' MLModelRepository-Single: allOf: @@ -488,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: @@ -504,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: @@ -525,10 +593,12 @@ components: properties: performanceGainThreshold: type: array + uniqueItems: true items: $ref: '#/components/schemas/ModelPerformance' newCapabilityVersionId: type: array + uniqueItems: true items: type: string updateTimeDeadline: @@ -539,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' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' mLModelRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' MLUpdateProcess-Single: allOf: @@ -558,14 +630,16 @@ components: $ref: '#/components/schemas/ProcessMonitor' cancelProcess: type: boolean + default: FALSE suspendProcess: type: boolean + default: FALSE mLModelRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' mLUpdateRequestRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $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: @@ -578,9 +652,9 @@ components: updatedMLCapability: $ref: '#/components/schemas/AvailMLCapabilityReport' mLModelRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $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: @@ -600,9 +674,9 @@ components: managedActivationScope: $ref: '#/components/schemas/AIMLManagementPolicy' usedByFunctionRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' mLModelRefList: - $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: @@ -628,11 +702,12 @@ components: properties: inferenceOutputs: type: array + uniqueItems: true items: $ref: '#/components/schemas/InferenceOutput' minItems: 1 mLModelRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' AIMLInferenceEmulationFunction-Single: allOf: 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 3938719ef007c872ae501ee7bc4374ee18933ecf..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,6 +988,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: $ref: "TS28541_5GcNrm.yaml#/components/schemas/NFType" 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 3d018cb18699e9e39f4220c58e9f6ac3c4e9f368..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.5.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: >- @@ -71,7 +74,7 @@ components: 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: @@ -82,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 @@ -100,6 +104,8 @@ components: properties: intentHandlingCapabilityList: type: array + uniqueItems: true + minItems: 1 items: $ref: '#/components/schemas/IntentHandlingCapability' Intent: @@ -125,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: @@ -155,6 +164,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: type: array + uniqueItems: true items: $ref: '#/components/schemas/Context' description: >- @@ -216,6 +226,7 @@ components: $ref: "#/components/schemas/NotFulfilledState" notFulfilledReasons: type: array + uniqueItems: true items: type: string readOnly: true @@ -285,6 +296,8 @@ components: targetValueRange: oneOf: - type: array + uniqueItems: true + minItems: 1 items: $ref: "#/components/schemas/ValueRangeType" - $ref: "#/components/schemas/ValueRangeType" @@ -292,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. @@ -310,6 +324,8 @@ components: contextValueRange: oneOf: - type: array + uniqueItems: true + minItems: 1 items: $ref: "#/components/schemas/ValueRangeType" - $ref: "#/components/schemas/ValueRangeType" @@ -326,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----------------# @@ -338,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----------------# @@ -354,6 +374,7 @@ components: properties: targetName: type: string + readOnly: true targetFulfilmentInfo: $ref: '#/components/schemas/FulfilmentInfo' targetAchievedValue: @@ -361,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----------------# @@ -372,8 +394,10 @@ components: properties: conflictId: type: string + readOnly: true conflictType: type: string + readOnly: true enum: - INTENT_CONFLICT - EXPECTATION_CONFLICT @@ -381,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 @@ -407,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----------------# @@ -424,6 +453,7 @@ components: properties: intentHandlingCapabilityId: type: string + readOnly: true supportedExpectationObjectType: type: string enum: @@ -431,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 54d2c5898b80ac041fa454e444906e97297d9dab..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.2.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,7 +168,9 @@ 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: @@ -196,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 83f86744da21584dabaed76065e4cf6c6a23b207..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: 19.0.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). @@ -99,16 +99,10 @@ components: readOnly: true secCredential: type: string - Duration: - type: object - properties: - startTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - endTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' EASServicePermission: type: string description: any of enumerated value + readOnly: true enum: - TRIAL - SILVER @@ -118,9 +112,11 @@ components: EASStatus: type: string description: any of enumerated value + readOnly: true enum: - ENABLED - DISABLED + - OVERLOAD_WARNING ResourceReservationRequirement: type: object properties: @@ -136,9 +132,11 @@ components: properties: resourceId: type: string + readOnly: true reservationStatus: type: string description: any of enumrated value + readOnly: true enum: - RESERVED - USEd @@ -153,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: @@ -169,6 +169,27 @@ 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: type: object @@ -180,6 +201,29 @@ components: 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 -------------------------------------------- EdgeDataNetwork-Single: @@ -199,6 +243,7 @@ components: $ref: '#/components/schemas/EESFunction-Multiple' availableEdgeVirtualResources: type: string + readOnly: true EASFunction-Single: allOf: @@ -228,6 +273,7 @@ components: $ref: '#/components/schemas/RelocationTriggerInfo' relocationRejectByASP: type: boolean + default: FALSE - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' EASProfile-Single: allOf: @@ -236,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: @@ -252,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: @@ -287,6 +340,10 @@ components: 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: @@ -311,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: @@ -328,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: @@ -384,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: @@ -404,6 +467,7 @@ components: properties: bundleIdentifier: type: string + readOnly: true bundledEASIdentifier: type: string bundleType: @@ -412,6 +476,7 @@ components: type: string coordinatedEASDiscovery: type: boolean + default: FALSE coordinatedACR: type: boolean eDNAffinity: @@ -460,6 +525,11 @@ components: type: array items: $ref: '#/components/schemas/EASBundle-Single' + ManagedEdgeNFService-Multiple: + type: array + items: + $ref: '#/components/schemas/ManagedEdgeNFService-Single' + #--------------------------------- Definition ------------------------------------ resources-edgeNrm: @@ -475,3 +545,4 @@ components: - $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 5fe4522ff4a25e39da3cb99a3b1f0810ca58486f..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: 19.1.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' @@ -96,6 +96,13 @@ components: type: string schema: type: string + nfServiceStatus: + type: string + enum: + - REGISTERED + - SUSPENDED + - UNDISCOVERABLE + - CANARY_RELEASE fqdn: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' interPlmnFqdn: @@ -106,18 +113,53 @@ components: $ref: '#/components/schemas/IpEndPoint' apiPrefix: type: string - allowedPlmns: + allowedPLMNs: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + allowedSnpns: + type: array + items: + $ref: '#/components/schemas/SnpnId' allowedNfTypes: type: array items: $ref: '#/components/schemas/NFType' - allowedNssais: + 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 @@ -196,6 +238,9 @@ components: - P_BDT - P_PLMNUE - P_NSSCD + - P_PDTQ + - P_MBSCD + - P_GROUP NotificationType: type: string readOnly: true @@ -208,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: @@ -216,6 +267,8 @@ components: callbackURI: type: string readOnly: true + interPlmnCallbackUri: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/UriRo' n1MessageClass: type: boolean readOnly: true @@ -228,6 +281,29 @@ components: 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: @@ -437,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: @@ -485,6 +563,7 @@ components: minItems: 1 muteNotif: type: boolean + default: false trafficSteeringPolIdDl: type: string nullable: true @@ -497,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: @@ -537,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: @@ -573,6 +655,7 @@ components: $ref: '#/components/schemas/SnssaiInfo' isSubjectToNsac: type: boolean + default: false maxNumberofUEs: type: integer eACMode: @@ -581,10 +664,13 @@ components: enum: - INACTIVE - ACTIVE + default: INACTIVE activeEacThreshold: type: integer + default: 0 deactiveEacThreshold: type: integer + default: 100 numberofUEs: type: integer readOnly: true @@ -692,8 +778,7 @@ components: type: object properties: uPFIpAddress: - type: string - readOnly: true + $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostRo' uPFRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' SnssaiList: @@ -736,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: @@ -816,6 +909,21 @@ components: - N6MB - N19MB - NMB9 + - S1U + - S5U + - S8U + - S11U + - S12 + - S2AU + - S2BU + - N3TRUSTEDN3GPP + - N3UNTRUSTEDN3GPP + - N9ROAMING + - SGI + - N19 + - SXAU + - SXBU + - N4U ipv4EndpointAddresses: type: array items: @@ -1016,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 @@ -1349,7 +1461,7 @@ components: minItems: 1 mappingInd: type: boolean - default: False + default: false ExternalClientType: description: Indicates types of External Clients. anyOf: @@ -2329,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 @@ -2355,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 @@ -2365,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: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' - 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' - 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: > @@ -2603,7 +2710,7 @@ components: required: - mbsServiceIdStart - mbsServiceIdEnd - - plmnId + - plMNId properties: mbsServiceIdStart: type: string @@ -2611,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' @@ -2666,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 @@ -2724,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 @@ -3194,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: @@ -3787,6 +3894,11 @@ components: - NWDAF_WITH_ANLF - NWDAF_WITH_MTLF - NWDAF_WITH_ANLF_MTLF + roamingAnalytics: + type: boolean + roamingData: + type: boolean + - type: object properties: EP_NL3: @@ -3956,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: @@ -4680,7 +4792,7 @@ components: allOf: - type: object properties: - FiveQiDscpMappingList: + fiveQiDscpMappingList: type: array items: $ref: '#/components/schemas/FiveQiDscpMapping' @@ -4763,12 +4875,15 @@ components: 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: @@ -4803,12 +4918,15 @@ components: 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: @@ -5513,7 +5631,11 @@ components: enum: - ACTIVATED - DEACTIVATED - readOnly: true + 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' diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 3aea8f9c8fe1cef764d495848f45351f8cb79780..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: 19.1.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). @@ -51,6 +51,7 @@ components: PlmnIdList: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' PlmnInfo: @@ -64,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' @@ -94,10 +113,12 @@ 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' BackhaulAddress: @@ -110,7 +131,7 @@ components: MappingSetIDBackhaulAddress: type: object properties: - setID: + setId: type: integer backhaulAddress: $ref: '#/components/schemas/BackhaulAddress' @@ -168,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' @@ -192,6 +224,7 @@ components: NRPciList: type: array + uniqueItems: true items: $ref: '#/components/schemas/NrPci' minItems: 0 @@ -199,6 +232,7 @@ components: CSonPciList: type: array + uniqueItems: true items: $ref: '#/components/schemas/NrPci' minItems: 1 @@ -277,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 @@ -300,36 +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 - default: 0 - rsrqOffsetSSB: - type: integer - default: 0 - sinrOffsetSSB: - type: integer - default: 0 - rsrpOffsetCSI-RS: - type: integer - default: 0 - rsrqOffsetCSI-RS: - type: integer - default: 0 - sinrOffsetCSI-RS: - type: integer - default: 0 + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' QOffsetRange: type: integer + default: 0 enum: - -24 - -22 @@ -362,21 +370,6 @@ 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 @@ -422,7 +415,6 @@ components: type: integer minimum: -1800 maximum: 1800 - RSSetId: type: integer maximum: 4194303 @@ -449,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: @@ -459,14 +458,24 @@ 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: @@ -523,10 +532,12 @@ components: type: integer consecutiveRIMRS1List: type: array + uniqueItems: true items: type: integer consecutiveRIMRS2List: type: array + uniqueItems: true items: type: integer enablenearfarIndicationRS1: @@ -574,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: @@ -609,6 +621,7 @@ components: NTNTAClist: type: array + uniqueItems: true items: $ref: '#/components/schemas/NrTac' @@ -633,8 +646,10 @@ components: EphemerisInfos: type: array + uniqueItems: true items: $ref: '#/components/schemas/Ephemeris' + minItems: 1 PositionVelocity: type: object @@ -713,6 +728,7 @@ components: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Ncgi' MappedCellIdInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/MappedCellIdInfo' QceIdMappingInfo: @@ -728,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: @@ -972,10 +991,14 @@ 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: @@ -992,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: @@ -1120,11 +1147,13 @@ 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: @@ -1167,6 +1196,7 @@ components: properties: bWPlist: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' maxItems: 12 @@ -1288,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' @@ -1367,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: @@ -1404,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: @@ -1467,15 +1520,27 @@ 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 @@ -1753,6 +1818,11 @@ components: $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: @@ -1819,8 +1889,13 @@ 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' @@ -2089,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 ---------------------- @@ -2248,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 --------------------------------- @@ -2315,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 1dc47d0e46215e27590fcce4dac5656cd8b4cc38..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: 19.0.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). @@ -34,6 +34,7 @@ components: readOnly: true PositioningAvailability: type: array + uniqueItems: true items: type: string enum: @@ -43,7 +44,9 @@ components: - AECID - HYBRID_POSITIONING - NET_RTK - readOnly: true + readOnly: true + minItems: 1 + maxItems: 6 PredictionFrequency: type: string enum: @@ -75,13 +78,16 @@ components: Tagging: type: array readOnly: true + uniqueItems: true items: type: string enum: - PERFORMANCE - FUNCTION - OPERATION - readOnly: true + minItems: 1 + maxItems: 3 + readOnly: true Exposure: type: string enum: @@ -125,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: 'TS28623_ComDefs.yaml#/components/schemas/FloatRo' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' maxThpt: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/FloatRo' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' MaxPktSize: type: object properties: @@ -150,7 +158,15 @@ components: $ref: '#/components/schemas/ServAttrCom' nOofPDUSessions: type: integer - readOnly: true + MaxNumberofUEs: + type: object + properties: + servAttrCom: + $ref: '#/components/schemas/ServAttrCom' + 3GPPNoOfUEs: + type: integer + non3GPPNoOfUEs: + type: integer KPIMonitoring: type: object properties: @@ -158,6 +174,7 @@ components: $ref: '#/components/schemas/ServAttrCom' kPIList: type: array + uniqueItems: true items: type: string readOnly: true @@ -175,6 +192,7 @@ components: $ref: '#/components/schemas/ServAttrCom' nROperatingBands: type: array + uniqueItems: true items: type: string Synchronicity: @@ -218,7 +236,6 @@ components: $ref: '#/components/schemas/ServAttrCom' density: type: integer - readOnly: true NsInfo: type: object properties: @@ -289,6 +306,7 @@ components: type: string secRules: type: array + uniqueItems: true items: type: string readOnly: true @@ -299,8 +317,10 @@ components: $ref: '#/components/schemas/ServAttrCom' secFuncList: type: array + uniqueItems: true items: $ref: '#/components/schemas/SecFunc' + minItems: 1 DataNetwork: type: object properties: @@ -308,6 +328,7 @@ components: $ref: '#/components/schemas/ServAttrCom' dnnList: type: array + uniqueItems: true items: type: string DataAccess: @@ -353,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' @@ -368,7 +392,7 @@ components: type: object properties: maxNumberofUEs: - type: integer + $ref: '#/components/schemas/MaxNumberofUEs' dLLatency: type: number uLLatency: @@ -428,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 @@ -444,7 +471,7 @@ components: resourceSharingLevel: $ref: '#/components/schemas/SharingLevel' maxNumberofUEs: - type: integer + $ref: '#/components/schemas/MaxNumberofUEs' activityFactor: type: integer dLThptPerSliceSubnet: @@ -467,6 +494,7 @@ components: type: integer nROperatingBands: type: array + uniqueItems: true items: type: string delayTolerance: @@ -510,7 +538,7 @@ components: uLLatency: type: integer maxNumberofUEs: - type: integer + $ref: '#/components/schemas/MaxNumberofUEs' dLThptPerSliceSubnet: $ref: '#/components/schemas/XLThpt' dLThptPerUE: @@ -527,6 +555,7 @@ components: type: integer nROperatingBands: type: array + uniqueItems: true items: type: string sliceSimultaneousUse: @@ -584,7 +613,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' ServiceProfile: type: object @@ -595,7 +627,7 @@ components: plmnInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList' maxNumberofUEs: - type: number + $ref: '#/components/schemas/MaxNumberofUEs' dLLatency: type: number uLLatency: @@ -644,6 +676,7 @@ components: $ref: '#/components/schemas/V2XCommModels' coverageArea: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' termDensity: @@ -681,7 +714,10 @@ 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 @@ -742,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: @@ -765,7 +803,8 @@ components: 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.. @@ -775,6 +814,7 @@ components: 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. @@ -914,7 +954,7 @@ components: type: string epApplicationRefs: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - connectionPointRefList: + externalEndPointRefList: type: array items: $ref: '#/components/schemas/ConnectionPointInfo' @@ -1035,6 +1075,7 @@ components: $ref: '#/components/schemas/NetworkSlicingApplicability' resourceIsolationRuleList: type: array + uniqueItems: true items: $ref: '#/components/schemas/ResourceIsolationRule' networkSliceRefList: diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index ff303617cc6b5653408e8a361c90be9b6d72fbab..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: 19.1.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). @@ -69,11 +69,13 @@ components: 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' @@ -168,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: @@ -193,16 +198,23 @@ 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 @@ -281,6 +293,10 @@ 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 @@ -357,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' @@ -408,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 305ba783ad2999b3e002fce451828ae8ed2fd367..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: 19.1.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). @@ -38,7 +38,7 @@ components: for usage in the "FileDownloadJob". type: object properties: - jobId: + id: type: string readOnly: true status: diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 1346cf3a95ebc02a366e20b4cc1583e8d7105be0..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: 19.1.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). @@ -59,17 +59,21 @@ components: properties: performanceMetrics: type: array + uniqueItems: true items: type: string - readOnly: true + 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: @@ -79,6 +83,7 @@ components: readOnly: true reportingPeriods: type: array + uniqueItems: true items: type: integer minimum: 1 @@ -110,7 +115,7 @@ components: This data type is the "ProcessMonitor" data type without specialisations. type: object properties: - jobId: + id: type: string readOnly: true status: @@ -146,19 +151,28 @@ components: - 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: @@ -189,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: @@ -209,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 @@ -228,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] @@ -288,18 +309,22 @@ components: type: string setOfMcc: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc' - readOnly: true + 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: @@ -309,6 +334,7 @@ components: type: string managedElementTypeList: type: array + uniqueItems: true items: type: string userLabel: @@ -329,10 +355,12 @@ components: type: integer supportedPerfMetricGroups: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupportedPerfMetricGroup' supportedTraceMetrics: type: array + uniqueItems: true items: type: string readOnly: true @@ -384,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: @@ -410,6 +442,7 @@ components: readOnly: true supportedPerfMetricGroups: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupportedPerfMetricGroup' @@ -500,6 +533,7 @@ components: properties: schedulingTimes: type: array + uniqueItems: true items: $ref: '#/components/schemas/SchedulingTime' minItems: 1 @@ -530,10 +564,12 @@ components: properties: notificationTypes: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationType' notificationProtocols: type: array + uniqueItems: true items: type: string enum: diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index 153a45cc9441d0973786250ca48c8672e5817cc8..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: 19.1.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). @@ -61,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/DnRo' + minItems: 1 #-------- Definition of YAML arrays for name-contained IOCs ---------------------- diff --git a/OpenAPI/TS28623_PmControlNrm.yaml b/OpenAPI/TS28623_PmControlNrm.yaml index 720842e2d5fdc2a1da51430b9e15cb3ce9e0421b..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: 19.0.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). @@ -47,8 +47,10 @@ components: type: string performanceMetrics: type: array + uniqueItems: true items: type: string + minItems: 1 granularityPeriod: type: integer minimum: 1 @@ -62,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 c7811203e19e34d545a025e518ac795c0680fcbe..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: 19.1.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). @@ -45,6 +45,7 @@ components: - VR areaScope: type: array + uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/AreaScope' qoECollectionEntityAddress: @@ -59,6 +60,7 @@ components: type: string sliceScope: type: array + uniqueItems: true items: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' qMCConfigFile: @@ -67,6 +69,7 @@ components: $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/traceReference-Type' availableRANqoEMetrics: type: array + uniqueItems: true items: type: string enum: diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml index f077c875dd5aeb2ea22dd609424e155a8e1b4b49..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: 19.1.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). @@ -42,7 +42,9 @@ components: - type: object properties: dataNodeSelector: - type: string + oneOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionBasic' + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionAdvanced' #-------- Definition of concrete IOCs -------------------------------------------- NtfSubscriptionControl-Single: @@ -57,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 84e95a94a738be33ec6ecc3d884f88d1ea3cefdf..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: 19.0.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). @@ -31,8 +31,10 @@ components: properties: performanceMetrics: type: array + uniqueItems: true items: type: string + minItems: 1 thresholdDirection: type: string enum: @@ -66,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 f2d85e495a2efd1e20cff926d9541033bfbcaa92..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: 19.1.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). @@ -385,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: @@ -423,6 +424,7 @@ components: 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 @@ -820,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 @@ -973,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: @@ -1218,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: @@ -1261,6 +1268,7 @@ components: excessPacketDelayThresholds-Type: description: Array of type excessPacketDelayThreshold-Type. type: array + uniqueItems: true items: $ref: '#/components/schemas/excessPacketDelayThreshold-Type' minItems: 0 @@ -1360,6 +1368,7 @@ components: $ref: '#/components/schemas/timeToTriggerL1-Type' mbsfnAreaList: type: array + uniqueItems: true items: $ref: '#/components/schemas/MbsfnArea' maxItems: 8 @@ -1371,11 +1380,13 @@ components: $ref: '#/components/schemas/eventListForEventTriggeredMeasurement-Type' areaConfigurationForNeighCell: 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' @@ -1387,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: @@ -1401,7 +1413,10 @@ components: type: object properties: ueCoreMeasurements: - type: string + type: array + items: + type: string + minItems: 1 ueCoreMeasGranularityPeriod: type: integer nfTypeToMeasure: @@ -1414,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: @@ -1437,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: @@ -1445,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 @@ -1455,8 +1492,10 @@ components: type: integer freqBands: type: array + uniqueItems: true items: type: integer + minItems: 1 MbsfnArea: type: object properties: @@ -1478,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)