diff --git a/OpenAPI/README.md b/OpenAPI/README.md index c0e969a3423284f17d20fc4487b36687dc426e9f..8be2519a32582f5f604c28245e1246ba51f688d5 100644 --- a/OpenAPI/README.md +++ b/OpenAPI/README.md @@ -103,6 +103,9 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28318_DsoNrm.yaml)) ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28318_DsoNrm.yaml)) +* Energy Information NRM (TS 28.310) +([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28310_EnergyInformationNrm.yaml)) +([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28310_EnergyInformationNrm.yaml)) ## Management Services (MnS) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index babe49e8fa5173ad065c32466d822eafed3c3f4f..4839ffc8e78daf40927cc7d27831c2eea9ff3d20 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: MDA NRM - version: 19.1.0 + version: 19.2.0 description: >- OAS 3.0.1 specification of the MDA NRM © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -17,22 +17,30 @@ components: 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 + - COVERAGE_ANALYTICS_COVERAGE_PROBLEM_ANALYSIS + - COVERAGE_ANALYTICS_PAGING_OPTIMIZATION + - SLS_ANALYSIS_SERVICE_EXPERIENCE_ANALYSIS + - SLS_ANALYSIS_NETWORK_SLICE_THROUGHPUT_ANALYSIS + - SLS_ANALYSIS_NETWORK_SLICE_TRAFFIC_ANALYSIS + - SLS_ANALYSIS_E2E_LATENCY_ANALYSIS + - SLS_ANALYSIS_NETWORK_SLICE_LOAD_ANALYSIS + - SLS_ANALYSIS_EDGE_APPLICATION_DEPLOYMENT_LOCATION_ANALYSIS + - SLS_ANALYSIS_EDGE_COMPUTING_PERFORMANCE_ANALYSIS + - SLS_ANALYSIS_TRAFFIC_CONGESTION_PREDICTION_ANALYSIS + - MDA_ASSISTED_FAULT_MANAGEMENT_FAILURE_PREDICTION + - MDA_ASSISTED_ENERGY_SAVING_ENERGY_SAVING_ANALYSIS + - MOBILITY_MANAGEMENT_ANALYTICS_MOBILITY_PERFORMANCE_ANALYSIS + - MOBILITY_MANAGEMENT_ANALYTICS_HANDOVER_OPTIMIZATION + - MAINTENANCE_MAINTENANCE_ANALYTICS + - MAINTENANCE_SOFTWARE_UPGRADE_VALIDATION_ANALYTICS + - RESOURCE_ANALYTICS_VIRTUALIZED_RESOURCE_UTILIZATION_ANALYSIS_NF + - RESOURCE_ANALYTICS_PHYSICAL_RESOURCE_UTILIZATION_ANALYSIS_NF + - RESOURCE_ANALYTICS_5GC_CONTROL_PLANE_CONGESTION_ANALYSIS + - PREDICTIONS_PM_DATA + - UE_THROUGHPUT_ANALYSIS_TRAFFIC_CONGESTION_PROBLEM_ANALYSIS + - CORRELATION_ANALYTICS_TRAINING_DATA_ANALYSIS + - CORRELATION_ANALYTICS_NF_SCALING_DIMENSIONING_DATA_ANALYSIS + MDATypes: type: array diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index 46eaca579fae8d41e2f778a9ae12806fe719dc28..3244b9f61a331e2399715316af410997235b4ede 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: MDA Report - version: 19.1.0 + version: 19.2.0 description: >- OAS 3.0.1 specification of the MDA Report © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -14,6 +14,30 @@ components: schemas: #-------- Definition of types----------------------------------------------------- + ProjectionDuration: + type: object + properties: + fromTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + toTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + PagingOptimizationAnalysisOutput: + type: object + properties: + oOCDuration: + $ref: '#/components/schemas/ProjectionDuration' + oOCLocation: + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate' + minItems: 1 + oOCMap: + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + minItems: 1 MDAOutputs: type: object @@ -21,10 +45,18 @@ components: mDAType: $ref: 'TS28104_MdaNrm.yaml#/components/schemas/MDAType' mDAOutputList: - type: array - uniqueItems: true - items: - $ref: '#/components/schemas/MDAOutputEntry' + oneOf: + - $ref: '#/components/schemas/CoverageProblemAnalysisoutput' + - $ref: '#/components/schemas/MobilityPerformanceAnalysisoutput' + - $ref: '#/components/schemas/TrainingDataAnalysisOutput' + - $ref: '#/components/schemas/NFScalingDimensioningDataAnalysisOutput' + - $ref: '#/components/schemas/PMDataOutput' + - $ref: '#/components/schemas/FailurePredictionOutput' + - $ref: '#/components/schemas/PagingOptimizationAnalysisOutput' + - type: array + uniqueItems: true + items: + $ref: '#/components/schemas/MDAOutputEntry' analyticsWindow: $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindowRo' confidenceDegree: @@ -60,3 +92,306 @@ components: $ref: '#/components/schemas/MDAOutputs' mDARequestRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' + +#-------- Definition of recommended action -------------------------------------------- + Recommended3GPPAction: + type: object + properties: + mOInstance: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + path: + type: string + op: + type: string + enum: + - ADD + - REMOVE + - REPLACE + value: + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' + additionalText: + type: array + items: + type: string + + RecommendedAction: + type: object + properties: + recommended3GPPActions: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/Recommended3GPPAction' + recommendedNon3GPPActions: + type: array + uniqueItems: true + items: + type: string + recommendedHumanReadableActions: + type: array + uniqueItems: true + items: + type: string + actionInterval: + type: integer + timeWindow: + type: array + uniqueItems: false + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + + + +#-------- Definition of specific MobilityPerformanceAnalysis MDAoutput ----------------------------- + MobilityPerformanceAnalysisoutput: + type: object + properties: + mobilityPerformanceIssueIdentifier: + type: integer + mobilityPerformanceIssueRootCause: + type: string + enum: + - TooLongMobilityInterruptionTime + - PoorCoverageOfTheCelledge + - InappropriateHandoverParameters + - Other + mobilityPerformanceIssueLocation: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + +#-------- Definition of specific CoverageProblemAnalysis MDAoutput ----------------------------- + CoverageProblemAnalysisoutput: + type: object + properties: + coverageProblemId: + type: string + coverageProblemType: + type: string + enum: + - WEAK_COVERAGE + - COVERAGE_HOLE + - PILOT_POLLUTION + - OVERSHOOT_COVERAGE + - DL_ULCHANNEL_COVERAGE_MISMATCH + - Other + coverageProblemAreas: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + problematicCells: + type: integer + recommendedActions: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/RecommendedAction' + radioEnvironmentMap: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/RadioEnvironmentMap' + cellConfigurations: + description: A map (list of key-value pairs) + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' + + RadioEnvironmentMap: + type: object + properties: + geoCoordinate: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + coverageCharacterization: + $ref: '#/components/schemas/CoverageCharacterization' + + CoverageCharacterization: + type: object + properties: + rsrp: + type: number + format: float + sinr: + type: number + format: float + +#-------- Definition of specific TrainingDataAnalysis MDAoutput ----------------------------- + + TrainingDataAnalysisOutput: + type: object + properties: + measurementDataCorrelationRecommendation: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/MeasurementDataCorrelationRecommendation' + + MeasurementDataCorrelationRecommendation: + type: object + properties: + recommendedMeasurementDataToCollect: + type: array + uniqueItems: true + items: + type: string + recommendedMeasurementDataNotToCollect: + type: array + uniqueItems: true + items: + type: string + modelPerformanceImpact: + type: integer + minimum: 0 + maximum: 100 + + + + +#-------- Definition of specific NFScalingDimensioningDataAnalysis MDAoutput ----------------------------- + + NFScalingDimensioningDataAnalysisOutput: + type: object + properties: + recommendedActions: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/RecommendedAction' + + + + + +#-------- Definition of specific PMData MDAoutput ----------------------------- + PMDataOutput: + type: object + properties: + pmPredictions: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/PmPrediction' + minItems: 1 + thresholdAssessment: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/ThresholdAssessment' + thresholdAdjustmentRecommendations: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/RecommendedAction' + + PmPrediction: + type: object + properties: + pmName: + type: string + pmPredictedValue: + description: >- + This specifies the predicted value of the PM specified by “pmName” + attribute. + oneOf: + - type: integer + - type: number + format: float + + thresholdAssessment: + $ref: '#/components/schemas/ThresholdAssessment' + + ThresholdAssessment: + type: object + properties: + performanceMetrics: + description: >- + It indicates list of performance metrics with threshold + configuration issue. + Performance metrics include measurements defined in TS 28.552 + and KPIs defined in TS 28.554. + For non-3GPP specified measurements the name is defined elsewhere. + type: array + uniqueItems: true + items: + type: string + timeWindow: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + confidenceScore: + type: number + format: float + + +#-------- Definition of specific FailurePrediction MDAoutput ----------------------------- + + FailurePredictionOutput: + type: object + properties: + failurePredictionObject: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + potentialFailureType: + type: string + potentialFailureCause: + oneOf: + - type: integer + - type: string + eventTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + issueID: + type: string + issueDomain: + type: string + enum: + - RAN_ISSUE + - CN_ISSUE + - UNKNOWN + perceivedSeverity: + type: string + enum: + - CRITICAL + - MAJOR + - MINOR + - WARNING + - INTERMEDIATE + - CLEARED + trendIndication: + type: string + enum: + - MORE_SEVERE + - NO_CHANGE + - LESS_SEVERE + predictedFailureEndTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + statisticsInfoList: + type: array + items: + type: integer + managementDataCollectionRecommendations: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/ManagementDataCollectionInfo' + recommendedActions: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/RecommendedAction' + + ManagementDataCollectionInfo: + type: object + properties: + managementDataType: + type: string + enum: + - MEASUREMENT + - KPI + - TRACE_MDT + - QOE + managementData: + $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/ManagementData' + targetEntities: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + collectionDuration: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + + + + diff --git a/OpenAPI/TS28111_FaultNrm.yaml b/OpenAPI/TS28111_FaultNrm.yaml index 1ea8c64e9e07725a9920d43d1fb7da1b8432d77f..13a6967dd9b89665592c0e8b6cedd80f04c80b6b 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: 19.1.0 + version: 19.2.0 description: >- OAS 3.0.1 definition of the Fault Supervision MnS © 2025, 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 + - OTHER readOnly: true ProbableCause: description: >- @@ -107,7 +108,7 @@ components: properties: down: $ref: '#/components/schemas/ThresholdHysteresis' - ThresholdInfo: + ThresholdCrossing: type: object properties: observedMeasurement: @@ -178,7 +179,7 @@ components: trendIndication: $ref: '#/components/schemas/TrendIndication' thresholdinfo: - $ref: '#/components/schemas/ThresholdInfo' + $ref: '#/components/schemas/ThresholdCrossing' correlatedNotifications: $ref: '#/components/schemas/CorrelatedNotifications' stateChangeDefinition: @@ -292,7 +293,7 @@ components: trendIndication: $ref: '#/components/schemas/TrendIndication' thresholdInfo: - $ref: '#/components/schemas/ThresholdInfo' + $ref: '#/components/schemas/ThresholdCrossing' correlatedNotifications: $ref: '#/components/schemas/CorrelatedNotifications' stateChangeDefinition: @@ -418,7 +419,7 @@ components: trendIndication: $ref: '#/components/schemas/TrendIndication' thresholdInfo: - $ref: '#/components/schemas/ThresholdInfo' + $ref: '#/components/schemas/ThresholdCrossing' stateChangeDefinition: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeValueChangeSet' monitoredAttributes: diff --git a/OpenAPI/TS28310_EnergyInformationNrm.yaml b/OpenAPI/TS28310_EnergyInformationNrm.yaml new file mode 100644 index 0000000000000000000000000000000000000000..496cb7c0e7756f7cf532fcfabe59a517f4f8c19b --- /dev/null +++ b/OpenAPI/TS28310_EnergyInformationNrm.yaml @@ -0,0 +1,95 @@ +openapi: 3.0.1 +info: + title: Energy Information NRM + version: 19.0.0 + description: >- + OAS 3.0.1 specification of the Energy Information NRM + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.310; Energy Information NRM + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.310/ +paths: {} +components: + schemas: + +#-------- Definition of types----------------------------------------------------- + EnergySourceInfo: + type: object + properties: + energySourceType: + type: string + energySourceCef: + type: number + format: float + minimum: 0 + renewableEnergy: + type: boolean + energyCompositionPercentage: + type: number + format: float + default: 100 + minimum: 1 + maximum: 100 + EnergySupplyMode: + type: string + enum: + - GRID_ELECTRICITY + - BACKUP_ENERGY + - LOCALLY_GENERATED_ENERGY + +#-------- Definition of concrete IOCs -------------------------------------------- + SubNetwork-ncO-EnergyInformationNrm: + type: object + properties: + EnergySupplyInfo: + $ref: '#/components/schemas/EnergySupplyInfo-Multiple' + EnergyInfoGroup: + $ref: '#/components/schemas/EnergyInfoGroup-Multiple' + + EnergySupplyInfo-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + energySupplyMode: + $ref: '#/components/schemas/EnergySupplyMode' + energySourceList: + type: array + uniqueItems: true + minItems: 1 + items: + $ref: '#/components/schemas/EnergySourceInfo' + EnergyInfoGroup-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + energySupplyModeRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + memberDNList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + +#-------- Definition of JSON arrays for name-contained IOCs ---------------------- + + EnergySupplyInfo-Multiple: + type: array + items: + $ref: '#/components/schemas/EnergySupplyInfo-Single' + EnergyInfoGroup-Multiple: + type: array + items: + $ref: '#/components/schemas/EnergyInfoGroup-Single' + +#--------------------------------- Definition ------------------------------------ + + resources-energyInformationNrm: + oneOf: + - $ref: '#/components/schemas/EnergySupplyInfo-Single' + - $ref: '#/components/schemas/EnergyInfoGroup-Single' diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 85edc5ba7f30f1e6bf161d9b6b81dc85c0e98cb9..e0ef86a290dc4e6e4fd9f0d918a809c0e32ca8d9 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: 19.1.0 + version: 19.2.0 description: >- OAS 3.0.1 definition of scenario specific Intent Expectations © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -43,7 +43,9 @@ components: - $ref: '#/components/schemas/AveDLPrbLoadTarget' - $ref: "#/components/schemas/RANEnergyConsumptionTarget" - $ref: "#/components/schemas/RANEnergyEfficiencyTarget" - - $ref: "#/components/schemas/ActiveUEsNumTarget" + - $ref: "#/components/schemas/ActiveUEsNumTarget" + - $ref: '#/components/schemas/PRBsTarget' + - $ref: '#/components/schemas/InterRAThandoverTarget' - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget' expectationContexts: type: array @@ -162,7 +164,55 @@ components: - $ref: '#/components/schemas/ResourceSharingLevelContext' - $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context" required: - - expectationId + - expectationId + NetworkMaintenanceExpectation: + description: >- + This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for Network Maintenance + type: object + properties: + expectationId: + type: string + expectationVerb: + $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb" + expectationObjects: + type: array + uniqueItems: true + items: + $ref: "#/components/schemas/NetworkMaintenanceExpectationObject" + expectationTargets: + type: array + uniqueItems: true + items: + type: object + oneOf: + - $ref: '#/components/schemas/MaintenanceVersionTarget' + - $ref: '#/components/schemas/WeakRSRPRatioTarget' + - $ref: '#/components/schemas/LowSINRRatioTarget' + - $ref: '#/components/schemas/AveULRANUEThptTarget' + - $ref: '#/components/schemas/AveDLRANUEThptTarget' + - $ref: '#/components/schemas/LowULRANUEThptRatioTarget' + - $ref: '#/components/schemas/LowDLRANUEThptRatioTarget' + - $ref: '#/components/schemas/HighULPrbLoadRatioTarget' + - $ref: '#/components/schemas/HighDLPrbLoadRatioTarget' + - $ref: '#/components/schemas/AveULPrbLoadTarget' + - $ref: '#/components/schemas/AveDLPrbLoadTarget' + - $ref: "#/components/schemas/RANEnergyConsumptionTarget" + - $ref: "#/components/schemas/RANEnergyEfficiencyTarget" + - $ref: "#/components/schemas/MaxNumberofPDUsessionsTarget" + - $ref: "#/components/schemas/MaxNumberofRegisteredsubscribersTarget" + - $ref: "#/components/schemas/IncomingDataTarget" + - $ref: "#/components/schemas/OutgoingDataTarget" + - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget" + expectationContexts: + type: array + uniqueItems: true + items: + type: object + oneOf: + - $ref: '#/components/schemas/MaintenanceTimeContext' + - $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context" + required: + - expectationId #-------Definition of the IntentExpectation dataType ----------# #-------Definition of the scenario specific ExpectationObject dataType ----------# @@ -174,7 +224,7 @@ components: objectType: type: string enum: - - RAN_SubNetwork + - RAN_SUBNETWORK objectInstance: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: @@ -185,6 +235,7 @@ components: oneOf: - $ref: '#/components/schemas/CoverageAreaPolygonContext' - $ref: '#/components/schemas/CoverageTACContext' + - $ref: '#/components/schemas/TimeBasedAreaContext' - $ref: '#/components/schemas/CellContext' - $ref: '#/components/schemas/PLMNContext' - $ref: '#/components/schemas/DlFrequencyContext' @@ -200,7 +251,7 @@ components: objectType: type: string enum: - - Radio_Service + - RADIO_SERVICE objectInstance: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: @@ -210,8 +261,12 @@ components: type: object oneOf: - $ref: '#/components/schemas/CoverageAreaPolygonContext' + - $ref: '#/components/schemas/DlFrequencyContext' + - $ref: '#/components/schemas/UlFrequencyContext' + - $ref: '#/components/schemas/CellContext' - $ref: '#/components/schemas/ServiceTypeContext' - - $ref: '#/components/schemas/PlmnInfoContext' + - $ref: '#/components/schemas/UEGroupContext' + - $ref: '#/components/schemas/GeoCoordinateContext' - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context' EdgeServiceSupportExpectationObject: description: >- @@ -221,7 +276,7 @@ components: objectType: type: string enum: - - EdgeService_Support #value for Edge Service Support Expectation--# + - EDGE_SERVICE_SUPPORT #value for Edge Service Support Expectation--# objectInstance: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: @@ -242,7 +297,7 @@ components: objectType: type: string enum: - - 5GC_SubNetwork #value for 5GC Network Expectation--# + - 5GC_SUBNETWORK #value for 5GC Network Expectation--# objectInstance: $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" objectContexts: @@ -258,6 +313,35 @@ components: - $ref: "#/components/schemas/ServingScopeContext" - $ref: "#/components/schemas/DnnContext" - $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context" + NetworkMaintenanceExpectationObject: + description: >- + This data type is the "ExpectationObject" data type with specialisations for NetworkMaintenanceExpectation + type: object + properties: + objectInstance: + $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" + objectContexts: + type: array + uniqueItems: true + items: + type: object + oneOf: + - $ref: "#/components/schemas/MaintenanceVersionContext" + - $ref: "#/components/schemas/MaintenanceOrderContext" + - $ref: "#/components/schemas/MaintenanceTypeContext" + - $ref: "#/components/schemas/NfTypeContext" + - $ref: "#/components/schemas/NfInstanceLocationContext" + - $ref: "#/components/schemas/PLMNContext" + - $ref: "#/components/schemas/TaiContext" + - $ref: "#/components/schemas/ServingScopeContext" + - $ref: "#/components/schemas/DnnContext" + - $ref: '#/components/schemas/CoverageAreaPolygonContext' + - $ref: '#/components/schemas/CoverageTACContext' + - $ref: '#/components/schemas/PLMNContext' + - $ref: '#/components/schemas/DlFrequencyContext' + - $ref: '#/components/schemas/UlFrequencyContext' + - $ref: '#/components/schemas/RATContext' + - $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context" #-------Definition of the ExpectationObject dataType ----------# @@ -640,6 +724,40 @@ components: type: integer minItems: 1 maxItems: 2 + PRBsTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for PRBsTarget. + It describes total available number of physical resource blocks (PRBs). This target is equal to the difference between the DL total available PRB plus UL total available PRB of operator A and the DL total available PRB plus UL total available PRB of operator B. DL total available PRB and UL total available PRB defined in clause 5.1.1.2.6 and 5.1.1.2.8 of TS 28.552 [12]. + type: object + properties: + targetName: + type: string + enum: + - PRBS + targetCondition: + type: string + enum: + - IS_EQUAL_TO + targetValueRange: + type: integer + InterRAThandoverTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for PRBsTarget. + it shows how often a handover from 5GS to EPS is successful. The InterRAThandover target is equal to the difference between 5GS to EPS handover success rate of operator A and 5GS to EPS handover success rate of operator B. For details see attribute 5GS to EPS handover success rate defined in clause 6.6.4 of TS 28.554 [11]. + type: object + properties: + targetName: + type: string + enum: + - INTERRATHANDOVER + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + minimum: 0 + maximum: 100 NumberofUEsTarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for NumberofUEsTarget.It describes @@ -671,7 +789,7 @@ components: enum: - IS_GREATER_THAN targetValueRange: - $ref: 'TS28541_SliceNrm.yaml#/components/schemas/XLThpt' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' ULThptPerUETarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for ULThptPerUETarget.It describes the UL throughput target by the per UE for the edge @@ -687,7 +805,7 @@ components: enum: - IS_GREATER_THAN targetValueRange: - $ref: 'TS28541_SliceNrm.yaml#/components/schemas/XLThpt' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' DLLatencyTarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for DLLatencyTarget.It describes the DL latency target for the edge service supporting or radio service @@ -851,6 +969,21 @@ components: - IS_LESS_THAN targetValueRange: type: integer + MaintenanceVersionTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for Maintenance Version Target. It describes the maintenance version target for the network maintenance, such as target version of the maintenance object after maintenance. + type: object + properties: + targetName: + type: string + enum: + - MaintenanceVersion + targetCondition: + type: string + enum: + - IS_EQUAL_TO + targetValueRange: + type: string #-------Definition of the concrete ExpectationTarget dataType----------# @@ -893,7 +1026,7 @@ components: CellContext: description: >- This data type is the "ObjectContext" data type with specialisations for CellContext. - It describes the coverage areas for the RAN SubNetwork that the intent expectation is applied + It describes the coverage areas for the RAN SubNetwork or Radio Service that the intent expectation is applied in the form of a list of cells (including E-UTRAN cells identified by E-UTRAN-CGI and NR cells identified by NG-RAN CGI). type: object @@ -914,6 +1047,32 @@ components: oneOf: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/EutraCellId' - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NrCellId' + TimeBasedAreaContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for TimeBasedAreaContext. + It describes the areas for specific times for the RAN SubNetwork that the intent expectation is + applied in the form of a list. + type: object + properties: + contextAttribute: + type: string + enum: + - TimeBasedArea + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + type: array + items: + $ref: "#/components/schemas/TimeBasedArea" + TimeBasedArea: + type: object + properties: + geoArea: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + timeWindow: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' PLMNContext: description: >- This data type is the "ObjectContext" data type with specialisations for PLMNContext @@ -932,10 +1091,26 @@ components: uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + GeoCoordinateContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for GeoCoordinateContext. + It describes the location (i.e. geocoordinate) that radio service intent is applied. + type: object + properties: + contextAttribute: + type: string + enum: + - GeoCoordinate + contextCondition: + type: string + enum: + - IS_EQUAL_TO + contextValueRange: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate' DlFrequencyContext: description: >- This data type is the "Context" data type with specialisations for Object context "DLFrequencyContext". It describes the downlink frequency information (RF reference - frequencies and/ or the frequency operating band) supported by the RAN SubNetwork that the intent expectation is applied. + frequencies and/ or the frequency operating band) supported by the RAN SubNetwork or Radio Service that the intent expectation is applied. type: object properties: contextAttribute: @@ -954,7 +1129,7 @@ components: UlFrequencyContext: description: >- This data type is the "Context" data type with specialisations for Object context "ULFrequencyContext".It describes the uplink frequency information (RF reference - frequencies and/ or the frequency operating band) supported by the RAN SubNetwork that the intent expectation is applied. + frequencies and/ or the frequency operating band) supported by the RAN SubNetwork or Radio Service that the intent expectation is applied. type: object properties: contextAttribute: @@ -995,7 +1170,7 @@ components: - NR UEGroupContext: description: >- - This data type is the "ObjectContext" data type with specialisations for UEGroup([5QI, SNSSAI]) + This data type is the "ObjectContext" data type with specialisations for UEGroup([5QI, SNSSAI, pLMNId]) type: object properties: contextAttribute: @@ -1149,6 +1324,61 @@ components: uniqueItems: true items: type: string + MaintenanceVersionContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for MaintenanceVersionContext. It describes the scope of the maintenance objects based on software version. + type: object + properties: + contextAttribute: + type: string + enum: + - swVersion + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + type: array + items: + type: string + MaintenanceOrderContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for MaintenanceOrderContext. It describes describes the list of DNs for NFs/NEs based on their order for maintenance. + type: object + properties: + contextAttribute: + type: string + enum: + - maintenanceOrder + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + type: array + items: + type: string + MaintenanceTypeContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for MaintenanceTypeContext. It describes the type of maintenance expected for the maintenance object. + type: object + properties: + contextAttribute: + type: string + enum: + - maintenanceType + contextCondition: + type: string + enum: + - IS_EQUAL_TO + contextValueRange: + type: array + uniqueItems: true + items: + type: string + enum: + - UPGRADE + - DOWNGRADE #-------Definition of the scenario specific ObjectTarget dataType----------------# #-------Definition of the concrete ExpectationContext dataType----------------# @@ -1246,23 +1476,6 @@ components: - IS_EQUAL_TO contextValueRange: $ref: "TS28541_NrNrm.yaml#/components/schemas/Sst" - PlmnInfoContext: - description: >- - This data type is the "ExpectationContext" data type with specialisations for PlmnInfoContext.It describes - the PLMN supported by the Radio Service that the intent expectation is applied. In case of network slicing - feature is supported, this also represents the S-NSSAI in the PLMN supported by the Radio Service. - type: object - properties: - contextAttribute: - type: string - enum: - - PlmnInfo - contextCondition: - type: string - enum: - - IS_ALL_OF - contextValueRange: - $ref: "TS28541_NrNrm.yaml#/components/schemas/PlmnInfo" SchedulingTimeContext: description: >- This data type is the "ExpectationContext" data type with specialisations for SchedulingTimeContext.It describes @@ -1295,4 +1508,19 @@ components: - IS_EQUAL_TO contextValueRange: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + MaintenanceTimeContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for MaintenanceTimeContext + type: object + properties: + contextAttribute: + type: string + enum: + - MaintenanceTime + contextCondition: + type: string + enum: + - IS_EQUAL_TO + contextValueRange: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' #-------Definition of the concrete ExpectionContext dataType----------------# diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 2048c8d88c1670c7c0fc3206da54a11faaf39705..c0242f0a30c8183ec0616e41a2b248c83e78b22e 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Intent NRM - version: 19.1.0 + version: 19.2.0 description: >- OAS 3.0.1 definition of the Intent NRM © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -43,10 +43,13 @@ components: - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/EdgeServiceSupportExpectation" - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/5GCNetworkExpectation" - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioServiceExpectation" + - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/NetworkMaintenanceExpectation" intentMgmtPurpose: $ref: "#/components/schemas/IntentMgmtPurpose" contextSelectivity: $ref: "#/components/schemas/Selectivity" + consumerSatisfactionIndexThreshold: + type: integer expectationSelectivity: $ref: "#/components/schemas/Selectivity" intentContexts: @@ -76,6 +79,8 @@ components: $ref: '#/components/schemas/IntentReportControl' intentReportReference: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' + intentUtilityFormulaRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' IntentReport-Single: description: It represents intent report information from MnS producer to MnS consumer. allOf: @@ -93,6 +98,10 @@ components: $ref: '#/components/schemas/IntentFeasibilityCheckReport' intentExplorationReport: $ref: '#/components/schemas/IntentExplorationReport' + intentUtilityReport: + $ref: '#/components/schemas/IntentUtilityReport' + intentFulfilmentNegotiationReport: + $ref: '#/components/schemas/IntentFulfilmentNegotiationReport' lastUpdatedTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' intentReference: @@ -120,8 +129,35 @@ components: Intent: $ref: '#/components/schemas/Intent-Multiple' IntentReport: - $ref: '#/components/schemas/IntentReport-Multiple' - + $ref: '#/components/schemas/IntentReport-Multiple' + supportedUtilityList: + type: array + items: + $ref: '#/components/schemas/UtilityDefinition' + uniqueItems: true + IntentUtilityFormula-Single: + description: >- + It represents an intent utility function instance. + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + utilityFunctionId: + type: string + uniqueItems: true + minItems: 1 + utilityParameterList: + type: array + items: + $ref: '#/components/schemas/UtilityParameter' + uniqueItems: true + minItems: 1 + utilityScale: + type: number + minItems: 1 + utilityOffset: + type: number + minItems: 1 #-------Definition of generic IOCs ----------# #-------Definition of the generic IntentExpectation dataType ----------# @@ -173,7 +209,8 @@ components: - RAN_SUBNETWORK #value for Radio Network Expectation--# - EDGE_SERVICE_SUPPORT #value for Edge Service Support Expectation--# - 5GC_SUBNETWORK #value for 5GC Network Expectation--# - - Radio_Service #value for Radio Service Expectation--# + - RADIO_SERVICE #value for Radio Service Expectation--# + - SUBNETWORK #value for Network Maintenance Expectation--# objectInstance: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: @@ -213,9 +250,10 @@ components: type: string enum: - FEASIBILITYCHECK - - FULFILMENT + - FULFILMENT_WITHOUT_NEGOTIATION - EXPLORATION - default: FULFILMENT + - FULFILMENT_WITH_NEGOTIATION + default: FULFILMENT_WITHOUT_NEGOTIATION FulfilmentStatus: type: string readOnly: true @@ -260,6 +298,7 @@ components: enum: - DELIVER - ENSURE + - MAINTAIN description: It describes the characteristic of the intentExpectation and is the property that describes the types of intentExpectations. Vendor extensions are allowed Frequency: description: >- @@ -292,14 +331,15 @@ components: - $ref: '#/components/schemas/UEGroup' - $ref: '#/components/schemas/Frequency' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' - - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfo' UEGroup: description: >- - It describes the UE Group, which is - represented by specific 5QI, specific S-NSSAI, or a specific combination - of S-NSSAI and 5QI + It describes the UE Group, + which is represented by specific 5QI, specific S-NSSAI, specific PLMNId or + a specific combination of S-NSSAI, 5QI and PLMNId. type: object properties: + pLMNId: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' fiveQI: type: integer minimum: 0 @@ -387,6 +427,7 @@ components: - INTENT_FULFILMENT_REPORT - INTENT_CONFLICT_REPORT - INTENT_FEASIBILITY_CHECK_REPORT + - INTENT_UTILITY_REPORT reportingConditions: description: >- It indicates the specified conditions for intent reporting. @@ -475,11 +516,10 @@ components: targetFulfilmentInfo: $ref: '#/components/schemas/FulfilmentInfo' targetAchievedValue: - type: number description: >- It describes the value that has been achieved for the expectation target at the time at which the report is generated. - readOnly: true + $ref: "#/components/schemas/ValueRangeType" targetContexts: type: array uniqueItems: true @@ -527,6 +567,20 @@ components: #-------Definition of the concrete IntentConflictReport dataType----------------# + +#-------Definition of the generic IntentUtilityReport dataType----------------# + IntentUtilityReport: + description: >- + It represents the utility function results. + type: object + properties: + utilityResultList: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/UtilityResult' + #-------Definition of the concrete IntentUtilityReport dataType----------------# + #-------Definition of the generic IntentFeasibilityCheckReport dataType----------------# IntentFeasibilityCheckReport: description: >- @@ -606,6 +660,90 @@ components: minItems: 1 #-------Definition of the generic IntentExplorationReport dataType----------------# + + + #-------Definition of the generic IntentFulfilmentNegotiationReport dataType----------------# + IntentFulfilmentNegotiationReport: + description: >- + It represents the intent negotiation information during fulfilment phase + This attribute shall be supported when intent fulfilment negotiation information is supported by IntentReport + type: object + properties: + possibleIntentOutcomeList: + type: array + items: + $ref: '#/components/schemas/PossibleIntentOutcome' + uniqueItems: true + minItems: 1 + intentFulfilmentNegotiationConsumerFeedback: + $ref: '#/components/schemas/IntentFulfilmentNegotiationFeedback' + implicitIntent: + $ref: '#/components/schemas/ImplicitIntent' + PossibleIntentOutcome: + description: >- + It represents a single outcome evaluated by the MnS producer + type: object + properties: + possibleIntentOutcomeId: + type: integer + readOnly: true + intentFulfilmentInfo: + $ref: '#/components/schemas/FulfilmentInfo' + expectationFulfilmentResults: + type: array + items: + $ref: '#/components/schemas/ExpectationFulfilmentResult' + uniqueItems: true + minItems: 1 + possibleImpacts: + type: array + items: + $ref: '#/components/schemas/PossibleImpact' + uniqueItems: true + minItems: 1 + PossibleImpact: + description: >- + It represents the possible impact of the possible outcome + type: object + properties: + impactedObjects: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' + minItems: 1 + impactedAttributes: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' + minItems: 1 + IntentFulfilmentNegotiationFeedback: + description: >- + It represents the feedback information that the MnS consumer provides to the + MnS producer as response during intent fulfilment Negotiation. + type: object + properties: + referredIntentOutcomeId: + type: integer + consumerSatisfactionIndex: + type: integer + ImplicitIntent: + description: >- + It represents the implicit intent which includes the information + that MnS consumers have not explicitly pointed out in its intent. + type: object + properties: + implicitIntentExpectations: + type: array + items: + $ref: '#/components/schemas/IntentExpectation' + implicitIntentContexts: + type: array + items: + $ref: '#/components/schemas/Context' + + #-------Definition of the generic IntentFulfilmentNegotiationReport dataType----------------# + + #-------Definition of the generic IntentHandlingCapability dataType----------------# IntentHandlingCapability: description: >- @@ -622,23 +760,21 @@ components: - RAN_SUBNETWORK - EDGE_SERVICE_SUPPORT - 5GC_SUBNETWORK - - Radio_Service + - 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: + supportedExpectationTargetInfoList: type: array + items: + $ref: '#/components/schemas/SupportedExpectationTargetInfo' uniqueItems: true minItems: 1 - items: - type: string - readOnly: true - description: It describes the supported expectation targets for the supported expectation object type. SupportedExpectationTargetInfo: description: >- It indicates the detailed information about what the intent driven MnS producer supports for a given supportedExpectationObjectType. type: object properties: - supportedExpectationTargetName: + supportedTargetName: type: string readOnly: true supportedTargetCondition: @@ -653,6 +789,51 @@ components: - $ref: '#/components/schemas/ValueRangeType' #-------Definition of the concrete IntentHandlingCapability dataType----------------# + + #-------Definition of the generic UtilityParameter dataType----------------# + UtilityParameter: + description: >- + It represents the inputs for the specified Intent Utility Function. + type: object + properties: + parameterName: + type: string + parameterWeight: + type: number + #-------Definition of the concrete UtilityParameter dataType----------------# + + #-------Definition of the generic UtilityResult dataType----------------# + UtilityResult: + description: >- + It represents the inputs for the specified Intent Utility Function. + type: object + properties: + utilityFunctionId: + type: string + utilityResult: + type: number + #-------Definition of the concrete UtilityResult dataType----------------# + + #-------Definition of the generic UtilityDefinition dataType----------------# + UtilityDefinition: + description: >- + It represents the inputs for the specified Intent Utility Function. + type: object + properties: + utilityDefinitionId: + type: string + utilityDescription: + type: string + utilityParameterList: + oneOf: + - type: array + uniqueItems: true + minItems: 1 + items: + $ref: '#/components/schemas/UtilityParameter' + - $ref: '#/components/schemas/UtilityParameter' + #-------Definition of the concrete UtilityDefinition dataType----------------# + #------Definition of JSON arrays for name-contained IOCs ---------------# Intent-Multiple: @@ -670,6 +851,10 @@ components: items: $ref: '#/components/schemas/IntentHandlingFunction-Single' + IntentUtilityFormula-Multiple: + type: array + items: + $ref: '#/components/schemas/IntentUtilityFormula-Single' #------Definition of JSON arrays for name-contained IOCs ---------------# @@ -678,6 +863,7 @@ components: oneOf: - $ref: '#/components/schemas/IntentHandlingFunction-Single' - $ref: '#/components/schemas/Intent-Single' - - $ref: '#/components/schemas/IntentReport-Single' + - $ref: '#/components/schemas/IntentReport-Single' + - $ref: '#/components/schemas/IntentUtilityFormula-Single' #----- Definitions in TS 28.312 for TS 28.532 --------------------------# diff --git a/OpenAPI/TS28318_DsoNrm.yaml b/OpenAPI/TS28318_DsoNrm.yaml index 06bc702eb4fead3221410144181a49918c3cfbca..5f7901bd33c3057e6d040460ee76a7ed6997f7d7 100644 --- a/OpenAPI/TS28318_DsoNrm.yaml +++ b/OpenAPI/TS28318_DsoNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: 3GPP NRM - version: 19.0.0 + version: 19.1.0 description: >- OAS 3.0.1 specification of the OutageAndRecoveryInfo NRM - © 2024, 3GPP Organizational OutageAndRecoveryInfo Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational OutageAndRecoveryInfo Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.318; OutageAndRecoveryInfo NRM @@ -17,8 +17,8 @@ components: EnergyServiceLocation: type: object properties: - CGI: - type: string + outageArea: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AreaOfInterest' energySupplyId: type: string diff --git a/OpenAPI/TS28532_FileDataReportingMnS.yaml b/OpenAPI/TS28532_FileDataReportingMnS.yaml index 4138a3c1147353019589b66e035b69954c6199ae..033a67bc5dae16b1d8d2076323633d8d63b0d0b0 100644 --- a/OpenAPI/TS28532_FileDataReportingMnS.yaml +++ b/OpenAPI/TS28532_FileDataReportingMnS.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: File Data Reporting MnS - version: 18.2.0 + version: 19.1.0 description: >- OAS 3.0.1 definition of the File Data Reporting MnS - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.532; Generic management services @@ -203,6 +203,17 @@ components: type: string fileDataType: $ref: '#/components/schemas/FileDataType' + jobId: + type: string + FileCreationErrorInfoList: + type: object + properties: + fileLocation: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' + fileDataType: + $ref: '#/components/schemas/FileDataType' + jobId: + type: string NotifyFileReady: allOf: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' @@ -222,7 +233,7 @@ components: fileInfoList: type: array items: - $ref: '#/components/schemas/FileInfo' + $ref: '#/components/schemas/FileCreationErrorInfoList' reason: type: string additionalText: diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 6c23bf257a44b0789c92b591eda95ebca8cc58a5..e24a69104a1e966833c25447a7326bc560fe773b 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Provisioning MnS - version: 19.0.0 + version: 19.1.0 description: >- OAS 3.0.1 definition of the Provisioning MnS © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -192,6 +192,48 @@ paths: application/json: schema: $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' + notifyPotentialFaultyDataNodeTree: + '{request.body#/notificationRecipientAddress}': + post: + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/NotifyPotentialFaultyDataNodeTree' + responses: + '204': + description: >- + Success case ("204 No Content"). + The notification is successfully delivered. The response + has no message body. + default: + description: Error case. + content: + application/json: + schema: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' + notifyDataNodeTreeSyncRecommended: + '{request.body#/notificationRecipientAddress}': + post: + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/NotifyDataNodeTreeSyncRecommended' + responses: + '204': + description: >- + Success case ("204 No Content"). + The notification is successfully delivered. The response + has no message body. + default: + description: Error case. + content: + application/json: + schema: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' get: summary: Reads one or multiple resources description: >- @@ -357,6 +399,41 @@ paths: application/json: schema: $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponseDefault' + '/{URI-LDN-first-part}': + parameters: + - name: URI-LDN-first-part + in: path + required: true + schema: + type: string + post: + summary: Creates a complete single resource + description: >- + With HTTP POST a complete single resource is created. The identifier of the new + resource is assigned by the MnS producer. + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/Resource' + responses: + '201': + description: >- + Success case ("201 Created"). + This status code shall be returned when the resource is created. + The representation of the created resource is returned in the response + message body. + content: + application/json: + schema: + $ref: '#/components/schemas/Resource' + default: + description: Error case. + content: + application/json: + schema: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponseDefault' components: schemas: CmNotificationTypes: @@ -367,6 +444,8 @@ components: - notifyMOIAttributeValueChanges - notifyEvent - notifyMOIChanges + - notifyPotentialFaultyDataNodeTree + - notifyDataNodeTreeSyncRecommended SourceIndicator: type: string enum: @@ -535,6 +614,20 @@ components: $ref: '#/components/schemas/MoiChange' required: - moiChanges + NotifyPotentialFaultyDataNodeTree: + allOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' + - type: object + properties: + scope: + $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/Scope' + NotifyDataNodeTreeSyncRecommended: + allOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' + - type: object + properties: + scope: + $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/Scope' PatchItem: type: object properties: diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 3aa0bbfa7b38e1e4cb303d48cdb62d6c7100de36..90eb86cef08c0c02eadab8adc7ca7f9e8621a5fb 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.3.0 + version: 19.4.0 description: >- OAS 3.0.1 specification of the Edge NRM © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -173,7 +173,7 @@ components: type: object properties: host: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Host' port: type: integer Operation: diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 0cab039044ecc3f9281d3167bf04e2f2deb76565..b99e102d04a4814fffd00de597e884ad383d163f 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.3.0 + version: 19.4.0 description: >- OAS 3.0.1 specification of the 5GC NRM © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -157,13 +157,64 @@ components: $ref: '#/components/schemas/VendorSpecificFeature' minItems: 1 minProperties: 1 + allowedScopesRuleSet: + description: A map (list of key-value pairs) where a valid JSON pointer Id serves as key + type: object + additionalProperties: + $ref: '#/components/schemas/RuleSet' + minProperties: 1 + nfServiceSetIdList: + description: This attribute represents a list of NF Service Set ID. + type: array + items: + type: string + perPlmnSnssaiList: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/PlmnSnssai' + load: + type: integer + minimum: 0 + maximum: 100 + loadTimeStamp: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + canaryRelease: + type: boolean + default: false + exclusiveCanaryReleaseSelection: + type: boolean + default: false + shutdownTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + canaryPrecedenceOverPreferred: + type: boolean + default: false + perPlmnOauth2ReqList: + $ref: '#/components/schemas/PlmnOauth2' + PlmnOauth2: + description: Oauth2.0 required indication for a given PLMN ID + type: object + properties: + oauth2RequiredPlmnIdList: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + minItems: 1 + oauth2NotRequiredPlmnIdList: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + minItems: 1 VendorSpecificFeature: type: object properties: featureName: type: string + readOnly: true featureVersion: type: string + readOnly: true NFStatus: type: string description: any of enumerated value @@ -340,6 +391,13 @@ components: readOnly: true nfType: $ref: '#/components/schemas/NFType' + collocatedNfInstances: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/CollocatedNfInstance' + nfInstanceName: + type: string nfStatus: $ref: '#/components/schemas/NFStatus' plmnList: @@ -359,7 +417,7 @@ components: authzInfo: type: string hostAddr: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Host' allowedPLMNs: type: array uniqueItems: true @@ -370,6 +428,11 @@ components: uniqueItems: true items: $ref: '#/components/schemas/SnpnId' + perPlmnSnssaiList: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/PlmnSnssai' allowedSNPNs: type: array uniqueItems: true @@ -390,10 +453,31 @@ components: uniqueItems: true items: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' + allowedRuleSet: + description: > + A map (list of key-value pairs) where a valid JSON pointer Id serves as key + type: object + additionalProperties: + $ref: '#/components/schemas/RuleSet' + minProperties: 1 locality: type: string + extLocality: + description: > + A map (list of key-value pairs) where a (unique) valid JSON string serves + as key representing a type of locality + type: object + additionalProperties: + type: string + minProperties: 1 capacity: type: integer + load: + type: integer + minimum: 0 + maximum: 100 + loadTimeStamp: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' nfSetIdList: type: array uniqueItems: true @@ -431,6 +515,14 @@ components: readOnly: true nfProfileChangesSupportInd: type: boolean + nfProfilePartialUpdateChangesSupportInd: + type: boolean + default: false + writeOnly: true + nfProfileChangesInd: + type: boolean + default: false + readOnly: true defaultNotificationSubscriptions: type: array uniqueItems: true @@ -450,6 +542,132 @@ components: uniqueItems: true items: $ref: '#/components/schemas/NFService' + supportedVendorSpecificFeatures: + description: > + A map (list of key-value pairs) where IANA-assigned "SMI Network Management Private Enterprise Codes" serves as key + type: object + additionalProperties: + type: array + items: + $ref: '#/components/schemas/VendorSpecificFeature' + minItems: 1 + minProperties: 1 + canaryRelease: + type: boolean + default: false + exclusiveCanaryReleaseSelection: + type: boolean + default: false + sharedProfileDataId: + type: string + shutdownTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + supportedRcfs: + type: array + uniqueItems: true + items: + type: string + minItems: 1 + canaryPrecedenceOverPreferred: + type: boolean + default: false + selectionConditions: + description: > + conditions under which an NF Instance shall be selected by an NF Service Consumer. + type: array + items: + $ref: '#/components/schemas/SelectionConditions' + minItems: 1 + SelectionConditions: + description: > + It contains the set of conditions that shall be evaluated to determine whether a consumer + shall select a given producer. The producer shall only be selected if the evaluation of + the conditions is . The set of conditions can be represented by a single + ConditionItem or by a ConditionGroup, where the latter contains a (recursive) list of + conditions joined by the "and" or "or" logical relationships. + oneOf: + - $ref: '#/components/schemas/ConditionItem' + - $ref: '#/components/schemas/ConditionGroup' + ConditionGroup: + description: > + List (array) of conditions (joined by the "and" or "or" logical relationship), + under which an NF Instance with an NFStatus or NFServiceStatus value set to, + "CANARY_RELEASE", or with a "canaryRelease" attribute set to true, + shall be selected by an NF Service Consumer. + type: object + oneOf: + - required: [ and ] + - required: [ or ] + properties: + and: + type: array + items: + $ref: '#/components/schemas/SelectionConditions' + minItems: 1 + or: + type: array + items: + $ref: '#/components/schemas/SelectionConditions' + minItems: 1 + ConditionItem: + description: > + A ConditionItem consists of a number of attributes representing individual conditions + (e.g. a SUPI range, or a TAI list). If several attributes/conditions are present, + the evaluation of the ConditionItem is if all attributes/conditions are evaluated + as (i.e., it follows the AND logical relationship). + type: object + allOf: + - not: + required: [ and ] + - not: + required: [ or ] + properties: + consumerNfTypes: + type: array + items: + $ref: '#/components/schemas/NFType' + minItems: 1 + serviceFeature: + type: integer + minimum: 1 + vsServiceFeature: + type: integer + minimum: 1 + supiRangeList: + type: array + items: + $ref: '#/components/schemas/SupiRange' + minItems: 1 + gpsiRangeList: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 1 + impuRangeList: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 1 + impiRangeList: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 1 + peiList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Pei' + minItems: 1 + taiRangeList: + type: array + items: + $ref: '#/components/schemas/TaiRange' + minItems: 1 + dnnList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' + minItems: 1 SEPPType: type: string readOnly: true @@ -663,6 +881,14 @@ components: items: $ref: '#/components/schemas/TrafficControlData' + ServiceFeatureMap: + type: object + properties: + featureList: + type: string + serviceName: + type: string + PccRule: type: object properties: @@ -711,6 +937,24 @@ components: $ref: 'TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/TscaiInputContainer' tscaiInputUl: $ref: 'TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/TscaiInputContainer' + easRedisIndRequired: + type: boolean + default: false + tscaiTimeDom: + type: integer + batNotificationCapable: + type: boolean + default: false + uENotifEnabled: + type: boolean + default: false + packFiltAllPrec: + type: integer + nscSupportedFeats: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/ServiceFeatureMap' SnssaiInfo: type: object @@ -809,6 +1053,10 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' minItems: 1 + SatelliteId: + type: string + pattern: '^[0-9]{5}$' + dnaiSatelliteMapping: type: object properties: @@ -819,8 +1067,7 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' minItems: 1 geoSatelliteId: - type: string - pattern: '^[0-9]{5}$' + $ref: '#/components/schemas/SatelliteId' SnssaiSmfInfoItem: type: object @@ -864,6 +1111,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostRo' uPFRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' + SnssaiList: type: array uniqueItems: true @@ -2644,9 +2892,9 @@ components: description: defines the list of satellite backhaul information type: object properties: - globalRanNodeID: - $ref: '#/components/schemas/GlobalRanNodeID' - SatelliteBackhaulCategory: + nTNGlobalRanNodeID: + $ref: '#/components/schemas/NTNGlobalRanNodeID' + satelliteBackhaulCategory: anyOf: - type: string enum: @@ -2663,7 +2911,7 @@ components: geoSatelliteId: type: string pattern: '^[0-9]{5}$' - GlobalRanNodeID: + NTNGlobalRanNodeID: description: globally identification of an NG-RAN node type: object oneOf: @@ -3249,49 +3497,41 @@ components: uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' - minItems: 1 pduSessionTypes: type: array uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/PduSessionType' - minItems: 1 ipv4AddressRanges: type: array uniqueItems: true items: $ref: '#/components/schemas/Ipv4AddressRange' - minItems: 1 ipv6PrefixRanges: type: array uniqueItems: true items: $ref: '#/components/schemas/Ipv6PrefixRange' - minItems: 1 natedIpv4AddressRanges: type: array uniqueItems: true items: $ref: '#/components/schemas/Ipv4AddressRange' - minItems: 1 natedIpv6PrefixRanges: type: array uniqueItems: true items: $ref: '#/components/schemas/Ipv6PrefixRange' - minItems: 1 ipv4IndexList: type: array uniqueItems: true items: $ref: '#/components/schemas/IpIndex' - minItems: 1 ipv6IndexList: type: array uniqueItems: true items: $ref: '#/components/schemas/IpIndex' - minItems: 1 networkInstance: description: > The N6 Network Instance associated with the S-NSSAI and DNN. @@ -3393,7 +3633,7 @@ components: type: object properties: host: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Host' port: type: integer NFServiceType: @@ -3495,6 +3735,84 @@ components: enum: - REGISTERED - DEREGISTERED + CollocatedNfInstance: + description: Information of an collocated NF Instance registered in the NRF + type: object + required: + - nfInstanceId + - nfType + properties: + nfInstanceId: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfInstanceId' + nfType: + $ref: '#/components/schemas/NFType' + PlmnSnssai: + description: List of network slices (S-NSSAIs) for a given PLMN ID + type: object + required: + - plmnId + - sNssaiList + properties: + plmnId: + $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId' + sNssaiList: + type: array + uniqueItems: true + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai' + minItems: 1 + nid: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Nid' + RuleSet: + type: object + required: + - priority + - action + properties: + priority: + type: integer + minimum: 0 + maximum: 65535 + plmns: + type: array + uniqueItems: true + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId' + snpns: + type: array + uniqueItems: true + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnIdNid' + nfTypes: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/NFType' + nfDomains: + type: array + uniqueItems: true + items: + type: string + nssais: + type: array + uniqueItems: true + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai' + nfInstances: + type: array + uniqueItems: true + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfInstanceId' + scopes: + type: array + uniqueItems: true + items: + type: string + action: + type: string + enum: + - ALLOW + - DENY #-------- Definition of types for name-containments ------ SubNetwork-ncO-5GcNrm: @@ -3588,6 +3906,10 @@ components: $ref: '#/components/schemas/MbUpfFunction-Multiple' MNPFFunction: $ref: '#/components/schemas/MnpfFunction-Multiple' + AiotfFunction: + $ref: '#/components/schemas/AiotfFunction-Multiple' + AdmFunction: + $ref: '#/components/schemas/AdmFunction-Multiple' #-------- Definition of concrete IOCs -------------------------------------------- AmfFunction-Single: @@ -3622,8 +3944,12 @@ components: $ref: '#/components/schemas/AmfInfo' sliceExpiryInfo: $ref: '#/components/schemas/SliceExpiryInfo' - SatelliteBackhaulInfoList: - $ref: '#/components/schemas/SatelliteBackhaulInfo' + satelliteBackhaulInfoList: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/SatelliteBackhaulInfo' + minItems: 1 mappedCellIdInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' mdtUserConsentReqList: @@ -3667,6 +3993,8 @@ components: $ref: '#/components/schemas/EP_N89-Multiple' EP_N11mb: $ref: '#/components/schemas/EP_N11mb-Multiple' + EP_AIOT3: + $ref: '#/components/schemas/EP_AIOT3-Multiple' AmfSet-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3811,8 +4139,9 @@ components: isOnboardSatellite: type: boolean onboardSatelliteId: + $ref: '#/components/schemas/SatelliteId' + uPFCapabilities: type: string - pattern: '^[0-9]{5}$' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object @@ -3986,7 +4315,11 @@ components: udrInfo: $ref: '#/components/schemas/UdrInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/ManagedFunction5GC-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' + - type: object + properties: + EP_AIOT7: + $ref: '#/components/schemas/EP_AIOT7-Multiple' UdsfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4027,6 +4360,8 @@ components: $ref: '#/components/schemas/NFProfileList' nrfInfo: $ref: '#/components/schemas/NrfInfo' + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object @@ -4037,6 +4372,8 @@ components: $ref: '#/components/schemas/EP_N96-Multiple' EP_SM14: $ref: '#/components/schemas/EP_SM14-Multiple' + EP_AIOT5: + $ref: '#/components/schemas/EP_AIOT5-Multiple' NssfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4120,7 +4457,11 @@ components: trpInfoList: $ref: '#/components/schemas/TrpInfoList' mappedCellIdInfoList: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' + $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' + mLModelRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' + aIMLInferenceFunctionRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object @@ -4247,7 +4588,7 @@ components: supportedFuncList: $ref: '#/components/schemas/SupportedFuncList' address: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Host' scpInfo: $ref: '#/components/schemas/ScpInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' @@ -4293,6 +4634,10 @@ components: $ref: '#/components/schemas/EP_N62-Multiple' EP_N63: $ref: '#/components/schemas/EP_N63-Multiple' + EP_AIOT4: + $ref: '#/components/schemas/EP_AIOT4-Multiple' + EP_AIOT8: + $ref: '#/components/schemas/EP_AIOT8-Multiple' NsacfFunction-Single: allOf: @@ -4371,6 +4716,10 @@ components: type: string easdfInfo: $ref: '#/components/schemas/EasdfInfo' + isOnboardSatellite: + type: boolean + onboardSatelliteId: + $ref: '#/components/schemas/SatelliteId' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object @@ -4476,6 +4825,64 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/FqdnRo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' + AiotfFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + plmnId: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + sBIFqdn: + type: string + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' + - type: object + properties: + EP_AIOT2: + $ref: '#/components/schemas/EP_AIOT2-Multiple' + EP_AIOT3: + $ref: '#/components/schemas/EP_AIOT3-Multiple' + EP_AIOT4: + $ref: '#/components/schemas/EP_AIOT4-Multiple' + EP_AIOT5: + $ref: '#/components/schemas/EP_AIOT5-Multiple' + EP_AIOT6: + $ref: '#/components/schemas/EP_AIOT6-Multiple' + + AdmFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + plmnId: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + sBIFqdn: + type: string + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' + - type: object + properties: + EP_AIOT6: + $ref: '#/components/schemas/EP_AIOT6-Multiple' + EP_AIOT7: + $ref: '#/components/schemas/EP_AIOT7-Multiple' + EP_AIOT8: + $ref: '#/components/schemas/EP_AIOT8-Multiple' + EP_N2-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4804,7 +5211,7 @@ components: remotePlmnId: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' remoteSeppAddress: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Host' remoteSeppId: type: integer n32cParas: @@ -5108,7 +5515,112 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' - + + EP_AIOT2-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + + EP_AIOT3-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + + EP_AIOT4-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + + EP_AIOT5-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + + EP_AIOT6-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + + EP_AIOT7-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + + EP_AIOT8-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + FiveQiDscpMappingSet-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -6162,7 +6674,15 @@ components: type: array items: $ref: '#/components/schemas/EASDFFunction-Single' - + AiotfFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/AiotfFunction-Single' + AdmFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/AdmFunction-Single' + EP_N2-Multiple: type: array items: @@ -6435,6 +6955,34 @@ components: type: array items: $ref: '#/components/schemas/EP_SM14-Single' + EP_AIOT2-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_AIOT2-Single' + EP_AIOT3-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_AIOT3-Single' + EP_AIOT4-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_AIOT4-Single' + EP_AIOT5-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_AIOT5-Single' + EP_AIOT6-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_AIOT6-Single' + EP_AIOT7-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_AIOT7-Single' + EP_AIOT8-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_AIOT8-Single' Configurable5QISet-Multiple: type: array items: @@ -6620,6 +7168,14 @@ components: - $ref: '#/components/schemas/EP_SM12-Single' - $ref: '#/components/schemas/EP_SM13-Single' - $ref: '#/components/schemas/EP_SM14-Single' + + - $ref: '#/components/schemas/EP_AIOT2-Single' + - $ref: '#/components/schemas/EP_AIOT3-Single' + - $ref: '#/components/schemas/EP_AIOT4-Single' + - $ref: '#/components/schemas/EP_AIOT5-Single' + - $ref: '#/components/schemas/EP_AIOT6-Single' + - $ref: '#/components/schemas/EP_AIOT7-Single' + - $ref: '#/components/schemas/EP_AIOT8-Single' - $ref: '#/components/schemas/Configurable5QISet-Single' - $ref: '#/components/schemas/FiveQiDscpMappingSet-Single' @@ -6639,3 +7195,5 @@ components: - $ref: '#/components/schemas/MbSmfFunction-Single' - $ref: '#/components/schemas/MbUpfFunction-Single' - $ref: '#/components/schemas/MnpfFunction-Single' + - $ref: '#/components/schemas/AiotfFunction-Single' + - $ref: '#/components/schemas/AdmFunction-Single' diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 4f85f00255a8c103f8102d396289d81edab2ad4f..30b636f3c7fbd27be14a13b06d957fc7298cb1e7 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.3.0 + version: 19.4.0 description: >- OAS 3.0.1 specification of the NR NRM © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -73,13 +73,13 @@ components: items: $ref: '#/components/schemas/PlmnInfo' minItems: 1 - NpnIdentityList: + NPNIdentityList: type: array uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type' minItems: 1 - GGnbId: + GgNBId: type: object properties: plmnId: @@ -88,7 +88,7 @@ components: $ref: '#/components/schemas/GnbIdLength' gnbId: $ref: '#/components/schemas/GnbId' - GEnbId: + GeNBId: type: object properties: plmnId: @@ -98,24 +98,24 @@ components: minimum: 0 maximum: 4194303 - GGnbIdList: + GgNBIdList: type: array uniqueItems: true items: - $ref: '#/components/schemas/GGnbId' + $ref: '#/components/schemas/GgNBId' - GEnbIdList: + GeNBIdList: type: array uniqueItems: true items: - $ref: '#/components/schemas/GEnbId' + $ref: '#/components/schemas/GeNBId' NrPci: type: integer maximum: 503 - NrTac: + NRTAC: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' - NrTacList: + NRTACList: type: array uniqueItems: true items: @@ -294,18 +294,18 @@ components: - NO - PARTIAL - FULL - RrmPolicyMember: + RRMPolicyMember: type: object properties: plmnId: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' snssai: $ref: '#/components/schemas/Snssai' - RrmPolicyMemberList: + RRMPolicyMemberList: type: array uniqueItems: true items: - $ref: '#/components/schemas/RrmPolicyMember' + $ref: '#/components/schemas/RRMPolicyMember' minItems: 1 AddressWithVlan: type: object @@ -610,13 +610,11 @@ components: type: integer minValue: type: integer - NTNTAClist: type: array uniqueItems: true items: - $ref: '#/components/schemas/NrTac' - + $ref: '#/components/schemas/NRTAC' Ephemeris: type: object oneOf: @@ -755,18 +753,31 @@ components: - M8 - M9 - MDT_UE_LOCATION + + NTNEntityConf: + type: object + properties: + nTNConfEntity: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + nTNConfList: + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' + + #-------- Definition of types for name-containments ------ SubNetwork-ncO-NrNrm: type: object properties: NRFrequency: $ref: '#/components/schemas/NRFrequency-Multiple' - ExternalGnbCuCpFunction: - $ref: '#/components/schemas/ExternalGnbCuCpFunction-Multiple' - ExternalGnbCuUpFunction: - $ref: '#/components/schemas/ExternalGnbCuUpFunction-Multiple' - ExternalGnbDuFunction: - $ref: '#/components/schemas/ExternalGnbDuFunction-Multiple' + ExternalGNBCUCPFunction: + $ref: '#/components/schemas/GNBCUCPFunction-Multiple' + ExternalGNBCUUPFunction: + $ref: '#/components/schemas/ExternalGNBCUUPFunction-Multiple' + ExternalGNBDUFunction: + $ref: '#/components/schemas/ExternalGNBDUFunction-Multiple' ExternalENBFunction: $ref: '#/components/schemas/ExternalENBFunction-Multiple' EUtranFrequency: @@ -785,6 +796,8 @@ components: $ref: '#/components/schemas/CPCIConfigurationFunction-Single' CESManagementFunction: $ref: '#/components/schemas/CESManagementFunction-Single' + RedCapAccessCriteria: + $ref: '#/components/schemas/RedCapAccessCriteria-Single' Configurable5QISet: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Configurable5QISet-Multiple' RimRSGlobal: @@ -795,16 +808,20 @@ components: $ref: '#/components/schemas/CCOFunction-Single' NTNFunction: $ref: '#/components/schemas/NTNFunction-Single' + NRECMappingRule: + $ref: '#/components/schemas/NRECMappingRule-Multiple' + MWAB: + $ref: '#/components/schemas/MWAB-Multiple' ManagedElement-ncO-NrNrm: type: object properties: - GnbDuFunction: - $ref: '#/components/schemas/GnbDuFunction-Multiple' - GnbCuUpFunction: - $ref: '#/components/schemas/GnbCuUpFunction-Multiple' - GnbCuCpFunction: - $ref: '#/components/schemas/GnbCuCpFunction-Multiple' + GNBDUFunction: + $ref: '#/components/schemas/GNBDUFunction-Multiple' + GNBCUUPFunction: + $ref: '#/components/schemas/GNBCUUPFunction-Multiple' + GNBCUCPFunction: + $ref: '#/components/schemas/GNBCUCPFunction-Multiple' DESManagementFunction: $ref: '#/components/schemas/DESManagementFunction-Single' DRACHOptimizationFunction: @@ -825,20 +842,24 @@ components: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' NTNFunction: $ref: '#/components/schemas/NTNFunction-Single' + NRECMappingRule: + $ref: '#/components/schemas/NRECMappingRule-Multiple' + MWAB: + $ref: '#/components/schemas/MWAB-Multiple' #-------- Definition of abstract IOCs -------------------------------------------- - RrmPolicy_-Attr: + RRMPolicy_-Attr: type: object properties: resourceType: $ref: '#/components/schemas/ResourceType' - rRMPolicyMemberList: - $ref: '#/components/schemas/RrmPolicyMemberList' + RRMPolicyMemberList: + $ref: '#/components/schemas/RRMPolicyMemberList' #-------- Definition of concrete IOCs -------------------------------------------- - GnbDuFunction-Single: + GNBDUFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -871,12 +892,12 @@ components: properties: RRMPolicyRatio: $ref: '#/components/schemas/RRMPolicyRatio-Multiple' - NrCellDu: - $ref: '#/components/schemas/NrCellDu-Multiple' - Bwp-Multiple: - $ref: '#/components/schemas/Bwp-Multiple' - NrSectorCarrier-Multiple: - $ref: '#/components/schemas/NrSectorCarrier-Multiple' + NRCellDU: + $ref: '#/components/schemas/NRCellDU-Multiple' + BWP-Multiple: + $ref: '#/components/schemas/BWP-Multiple' + NRSectorCarrier-Multiple: + $ref: '#/components/schemas/NRSectorCarrier-Multiple' EP_F1C: $ref: '#/components/schemas/EP_F1C-Single' EP_F1U: @@ -884,15 +905,17 @@ components: DRACHOptimizationFunction: $ref: '#/components/schemas/DRACHOptimizationFunction-Single' OperatorDU: - $ref: '#/components/schemas/OperatorDu-Multiple' + $ref: '#/components/schemas/OperatorDU-Multiple' BWPSet: $ref: '#/components/schemas/BWPSet-Multiple' Configurable5QISet: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Configurable5QISet-Multiple' Dynamic5QISet: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' + AIOTReader: + $ref: '#/components/schemas/AIOTReader-Multiple' - OperatorDu-Single: + OperatorDU-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -913,9 +936,9 @@ components: dynamic5QISetRef: description: This attribute is condition optional. The condition is NG-RAN Multi-Operator Core Network (NG-RAN MOCN) network sharing with operator specific 5QI is supported. $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' - NrOperatorCellDu: - $ref: '#/components/schemas/NrOperatorCellDu-Multiple' - GnbCuUpFunction-Single: + NROperatorCellDU: + $ref: '#/components/schemas/NROperatorCellDU-Multiple' + GNBCUUPFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -935,7 +958,7 @@ components: type: boolean onboardSatelliteId: $ref: '#/components/schemas/SatelliteId' - plmnInfoList: + PlmnInfoList: $ref: '#/components/schemas/PlmnInfoList' configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' @@ -963,7 +986,7 @@ components: Dynamic5QISet: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' - GnbCuCpFunction-Single: + GNBCUCPFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -982,17 +1005,17 @@ components: plmnId: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' x2BlockList: - $ref: '#/components/schemas/GGnbIdList' + $ref: '#/components/schemas/GgNBIdList' xnBlockList: - $ref: '#/components/schemas/GGnbIdList' + $ref: '#/components/schemas/GgNBIdList' x2AllowList: - $ref: '#/components/schemas/GGnbIdList' + $ref: '#/components/schemas/GgNBIdList' xnAllowList: - $ref: '#/components/schemas/GGnbIdList' + $ref: '#/components/schemas/GgNBIdList' x2HOBlockList: - $ref: '#/components/schemas/GEnbIdList' + $ref: '#/components/schemas/GeNBIdList' xnHOBlockList: - $ref: '#/components/schemas/GGnbIdList' + $ref: '#/components/schemas/GgNBIdList' mappingSetIDBackhaulAddressList: type: array uniqueItems: true @@ -1030,8 +1053,8 @@ components: properties: RRMPolicyRatio: $ref: '#/components/schemas/RRMPolicyRatio-Multiple' - NrCellCu: - $ref: '#/components/schemas/NrCellCu-Multiple' + NRCellCU: + $ref: '#/components/schemas/NRCellCU-Multiple' EP_XnC: $ref: '#/components/schemas/EP_XnC-Multiple' EP_E1: @@ -1059,7 +1082,7 @@ components: EUtranNetwork: $ref: '#/components/schemas/EUtraNetwork-Single' - NrCellCu-Single: + NRCellCU-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -1099,7 +1122,7 @@ components: DPCIConfigurationFunction: $ref: '#/components/schemas/DPCIConfigurationFunction-Single' - NrCellDu-Single: + NRCellDU-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -1117,14 +1140,21 @@ components: type: integer cellState: $ref: '#/components/schemas/CellState' - plmnInfoList: + plmnInfoInfoList: $ref: '#/components/schemas/PlmnInfoList' - npnIdentityList: - $ref: '#/components/schemas/NpnIdentityList' + nPNIdentityList: + $ref: '#/components/schemas/NPNIdentityList' nrPci: $ref: '#/components/schemas/NrPci' - nrTac: + nRTAC: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' + nTNTAClist: + type: array + uniqueItems: true + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' + minItems: 1 + maxItems: 12 arfcnDL: type: integer arfcnUL: @@ -1159,22 +1189,24 @@ components: enum: - REDCAP_1RX - REDCAP_2RX - nrSectorCarrierRef: + nRSectorCarrierRef: type: array uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - bwpRef: + bWPRef: description: "Condition is BWP sets are not supported" type: array uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - bwpSetRef: + bWPSetRef: description: "Condition is BWP sets are supported" $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' rimRSMonitoringStartTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + redCapAccessCriteriaRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' rimRSMonitoringStopTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' rimRSMonitoringWindowDuration: @@ -1216,7 +1248,7 @@ components: maxItems: 12 - NrOperatorCellDu-Single: + NROperatorCellDU-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -1227,7 +1259,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' plmnInfoList: $ref: '#/components/schemas/PlmnInfoList' - nrTac: + nRTAC: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' NRFrequency-Single: @@ -1266,7 +1298,7 @@ components: minimum: 1 maximum: 256 - NrSectorCarrier-Single: + NRSectorCarrier-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -1295,7 +1327,7 @@ components: properties: CommonBeamformingFunction: $ref: '#/components/schemas/CommonBeamformingFunction-Single' - Bwp-Single: + BWP-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -1388,7 +1420,7 @@ components: properties: attributes: allOf: - - $ref: '#/components/schemas/RrmPolicy_-Attr' + - $ref: '#/components/schemas/RRMPolicy_-Attr' - type: object properties: rRMPolicyMaxRatio: @@ -1786,7 +1818,18 @@ components: $ref: '#/components/schemas/TimeDomainPara' RimRSSet: $ref: '#/components/schemas/RimRSSet-Multiple' - + RedCapAccessCriteria-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + nRCellDURef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + criteriaConditonRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' RimRSSet-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1802,7 +1845,7 @@ components: nRCellDURefs: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' - ExternalGnbDuFunction-Single: + ExternalGNBDUFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -1830,15 +1873,15 @@ components: properties: NRFrequency: $ref: '#/components/schemas/NRFrequency-Multiple' - ExternalGnbCuCpFunction: - $ref: '#/components/schemas/ExternalGnbCuCpFunction-Multiple' - ExternalGnbCuUpFunction: - $ref: '#/components/schemas/ExternalGnbCuUpFunction-Multiple' - ExternalGnbDuFunction: - $ref: '#/components/schemas/ExternalGnbDuFunction-Multiple' + ExternalGNBCUCPFunction: + $ref: '#/components/schemas/ExternalGNBCUCPFunction-Multiple' + ExternalGNBCUUPFunction: + $ref: '#/components/schemas/ExternalGNBCUUPFunction-Multiple' + ExternalGNBDUFunction: + $ref: '#/components/schemas/ExternalGNBDUFunction-Multiple' - ExternalGnbCuUpFunction-Single: + ExternalGNBCUUPFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -1861,7 +1904,7 @@ components: $ref: '#/components/schemas/EP_F1U-Multiple' EP_XnU: $ref: '#/components/schemas/EP_XnU-Multiple' - ExternalGnbCuCpFunction-Single: + ExternalGNBCUCPFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -1881,15 +1924,15 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: - ExternalNrCellCu: - $ref: '#/components/schemas/ExternalNrCellCu-Multiple' + ExternalNRCellCU: + $ref: '#/components/schemas/ExternalNRCellCU-Multiple' EP_XnC: $ref: '#/components/schemas/EP_XnC-Multiple' EP_E1: $ref: '#/components/schemas/EP_E1-Multiple' EP_F1C: $ref: '#/components/schemas/EP_F1C-Multiple' - ExternalNrCellCu-Single: + ExternalNRCellCU-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -2110,11 +2153,11 @@ components: properties: cCOControl: type: boolean - cCOWeakCoverageParameters: + CCOWeakCoverageParameters: $ref: '#/components/schemas/CCOWeakCoverageParameters-Single' - cCOPilotPollutionParameters: + CCOPilotPollutionParameters: $ref: '#/components/schemas/CCOPilotPollutionParameters-Single' - cCOOvershootCoverageParameters-Single: + CCOOvershootCoverageParameters-Single: $ref: '#/components/schemas/CCOOvershootCoverageParameters-Single' CCOParameters-Attr: allOf: @@ -2163,9 +2206,11 @@ components: nTNpLMNInfoList: $ref: '#/components/schemas/PlmnInfoList' nTNTAClist: - $ref: '#/components/schemas/NrTacList' - ephemerisInfoSet: + $ref: '#/components/schemas/NRTACList' + EphemerisInfoSet: $ref: '#/components/schemas/EphemerisInfoSet-Multiple' + nTNTimeBasedConfig: + $ref: '#/components/schemas/NTNTimeBasedConfig-Multiple' EphemerisInfoSet-Single: allOf: @@ -2189,15 +2234,17 @@ components: administrativeState: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' operationalState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' allowedArea: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' allowedTime: type: array + uniqueItems: true items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' NRECMappingRule-Single: allOf: @@ -2214,44 +2261,92 @@ components: type: integer ecTimeInterval: type: integer + + NTNTimeBasedConfig-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + timeWindow: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + nTNEntityConfigList: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/NTNEntityConf' + minItems: 1 + AIOTReader-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + readerId: + type: integer + administrativeState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' + supportedAIOTServices: + type: array + uniqueItems: true + items: + type: string + enum: + - INVENTORY + - COMMAND + plmnId: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + nRSectorCarrierRef: + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- - GnbDuFunction-Multiple: + GNBDUFunction-Multiple: type: array items: - $ref: '#/components/schemas/GnbDuFunction-Single' - OperatorDu-Multiple: + $ref: '#/components/schemas/GNBDUFunction-Single' + OperatorDU-Multiple: type: array items: - $ref: '#/components/schemas/OperatorDu-Single' - GnbCuUpFunction-Multiple: + $ref: '#/components/schemas/OperatorDU-Single' + GNBCUUPFunction-Multiple: type: array items: - $ref: '#/components/schemas/GnbCuUpFunction-Single' - GnbCuCpFunction-Multiple: + $ref: '#/components/schemas/GNBCUUPFunction-Single' + GNBCUCPFunction-Multiple: type: array items: - $ref: '#/components/schemas/GnbCuCpFunction-Single' + $ref: '#/components/schemas/GNBCUCPFunction-Single' BWPSet-Multiple: type: array items: $ref: '#/components/schemas/BWPSet-Single' - NrCellDu-Multiple: + NRCellDU-Multiple: type: array items: - $ref: '#/components/schemas/NrCellDu-Single' + $ref: '#/components/schemas/NRCellDU-Single' - NrOperatorCellDu-Multiple: + NROperatorCellDU-Multiple: type: array items: - $ref: '#/components/schemas/NrOperatorCellDu-Single' + $ref: '#/components/schemas/NROperatorCellDU-Single' - NrCellCu-Multiple: + NRCellCU-Multiple: type: array items: - $ref: '#/components/schemas/NrCellCu-Single' + $ref: '#/components/schemas/NRCellCU-Single' NRFrequency-Multiple: type: array @@ -2264,14 +2359,14 @@ components: items: $ref: '#/components/schemas/EUtranFrequency-Single' - NrSectorCarrier-Multiple: + NRSectorCarrier-Multiple: type: array items: - $ref: '#/components/schemas/NrSectorCarrier-Single' - Bwp-Multiple: + $ref: '#/components/schemas/NRSectorCarrier-Single' + BWP-Multiple: type: array items: - $ref: '#/components/schemas/Bwp-Single' + $ref: '#/components/schemas/BWP-Single' Beam-Multiple: type: array items: @@ -2303,22 +2398,22 @@ components: items: $ref: '#/components/schemas/RimRSSet-Single' - ExternalGnbDuFunction-Multiple: + ExternalGNBDUFunction-Multiple: type: array items: - $ref: '#/components/schemas/ExternalGnbDuFunction-Single' - ExternalGnbCuUpFunction-Multiple: + $ref: '#/components/schemas/ExternalGNBDUFunction-Single' + ExternalGNBCUUPFunction-Multiple: type: array items: - $ref: '#/components/schemas/ExternalGnbCuUpFunction-Single' - ExternalGnbCuCpFunction-Multiple: + $ref: '#/components/schemas/ExternalGNBCUUPFunction-Single' + ExternalGNBCUCPFunction-Multiple: type: array items: - $ref: '#/components/schemas/ExternalGnbCuCpFunction-Single' - ExternalNrCellCu-Multiple: + $ref: '#/components/schemas/ExternalGNBCUCPFunction-Single' + ExternalNRCellCU-Multiple: type: array items: - $ref: '#/components/schemas/ExternalNrCellCu-Single' + $ref: '#/components/schemas/ExternalNRCellCU-Single' ExternalENBFunction-Multiple: type: array @@ -2341,6 +2436,10 @@ components: type: array items: $ref: '#/components/schemas/EP_F1C-Single' + RedCapAccessCriteria-Multiple: + type: array + items: + $ref: '#/components/schemas/RedCapAccessCriteria-Single' EP_NgC-Multiple: type: array items: @@ -2377,19 +2476,31 @@ components: type: array items: $ref: '#/components/schemas/NRECMappingRule-Single' + NTNTimeBasedConfig-Multiple: + type: array + items: + $ref: '#/components/schemas/NTNTimeBasedConfig-Single' + MWAB-Multiple: + type: array + items: + $ref: '#/components/schemas/MWAB-Single' + AIOTReader-Multiple: + type: array + items: + $ref: '#/components/schemas/AIOTReader-Single' #-------- Definitions in TS 28.541 for TS 28.532 --------------------------------- resources-nrNrm: oneOf: - - $ref: '#/components/schemas/GnbDuFunction-Single' - - $ref: '#/components/schemas/GnbCuUpFunction-Single' - - $ref: '#/components/schemas/GnbCuCpFunction-Single' - - $ref: '#/components/schemas/OperatorDu-Single' + - $ref: '#/components/schemas/GNBDUFunction-Single' + - $ref: '#/components/schemas/GNBCUUPFunction-Single' + - $ref: '#/components/schemas/GNBCUCPFunction-Single' + - $ref: '#/components/schemas/OperatorDU-Single' - - $ref: '#/components/schemas/NrCellCu-Single' - - $ref: '#/components/schemas/NrCellDu-Single' - - $ref: '#/components/schemas/NrOperatorCellDu-Single' + - $ref: '#/components/schemas/NRCellCU-Single' + - $ref: '#/components/schemas/NRCellDU-Single' + - $ref: '#/components/schemas/NROperatorCellDU-Single' - $ref: '#/components/schemas/NRNetwork-Single' - $ref: '#/components/schemas/EUtraNetwork-Single' @@ -2397,8 +2508,8 @@ components: - $ref: '#/components/schemas/NRFrequency-Single' - $ref: '#/components/schemas/EUtranFrequency-Single' - - $ref: '#/components/schemas/NrSectorCarrier-Single' - - $ref: '#/components/schemas/Bwp-Single' + - $ref: '#/components/schemas/NRSectorCarrier-Single' + - $ref: '#/components/schemas/BWP-Single' - $ref: '#/components/schemas/BWPSet-Single' - $ref: '#/components/schemas/CommonBeamformingFunction-Single' - $ref: '#/components/schemas/Beam-Single' @@ -2421,10 +2532,10 @@ components: - $ref: '#/components/schemas/RimRSGlobal-Single' - $ref: '#/components/schemas/RimRSSet-Single' - - $ref: '#/components/schemas/ExternalGnbDuFunction-Single' - - $ref: '#/components/schemas/ExternalGnbCuUpFunction-Single' - - $ref: '#/components/schemas/ExternalGnbCuCpFunction-Single' - - $ref: '#/components/schemas/ExternalNrCellCu-Single' + - $ref: '#/components/schemas/ExternalGNBDUFunction-Single' + - $ref: '#/components/schemas/ExternalGNBCUUPFunction-Single' + - $ref: '#/components/schemas/ExternalGNBCUCPFunction-Single' + - $ref: '#/components/schemas/ExternalNRCellCU-Single' - $ref: '#/components/schemas/ExternalENBFunction-Single' - $ref: '#/components/schemas/ExternalEUTranCell-Single' @@ -2446,3 +2557,7 @@ components: - $ref: '#/components/schemas/EphemerisInfoSet-Single' - $ref: '#/components/schemas/MWAB-Single' - $ref: '#/components/schemas/NRECMappingRule-Single' + - $ref: '#/components/schemas/NTNTimeBasedConfig-Single' + - $ref: '#/components/schemas/RedCapAccessCriteria-Single' + - $ref: '#/components/schemas/AIOTReader-Single' + diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index b65edbc63aa11a5e220d2b3f292759bc9f65959f..d062e7bfdf8667d51e61b8660c93e9b41e06cb1b 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.3.0 + version: 19.4.0 description: >- OAS 3.0.1 specification of the Slice NRM @ 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -456,6 +456,10 @@ components: uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' + renewableEnergyPct: + type: integer + minimum: 0 + maximum: 100 RANSliceSubnetProfile: type: object @@ -529,6 +533,10 @@ components: $ref: '#/components/schemas/Float' uLPktDelayVariation: $ref: '#/components/schemas/Float' + renewableEnergyPct: + type: integer + minimum: 0 + maximum: 100 TopSliceSubnetProfile: type: object @@ -617,6 +625,10 @@ components: uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' + renewableEnergyPct: + type: integer + minimum: 0 + maximum: 100 ServiceProfile: type: object @@ -718,6 +730,10 @@ components: uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' + renewableEnergyPct: + type: integer + minimum: 0 + maximum: 100 SliceProfile: type: object diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 3742ff0646bcfe457da49da984597df531d14efa..7d4cb0b6131718a685d5189c1974f3d1a2470013 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.3.0 + version: 19.4.0 description: >- OAS 3.0.1 specification of common type definitions in the Generic NRM © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -128,39 +128,21 @@ components: type: string pattern: '^[A-Fa-f0-9]{9}$' TimeWindow: - description: This datatype is used for writable attribute - oneOf: - - type: object - properties: - startTime: - $ref: '#/components/schemas/DateTime' - endTime: - $ref: '#/components/schemas/DateTime' - - type: object - properties: - startTime: - $ref: '#/components/schemas/DateTime' - - type: object - properties: - endTime: - $ref: '#/components/schemas/DateTime' + description: This datatype is used for writable attribute + type: object + properties: + startTime: + $ref: '#/components/schemas/DateTime' + endTime: + $ref: '#/components/schemas/DateTime' TimeWindowRo: - description: This datatype is used for readOnly attribute - oneOf: - - type: object - properties: - startTime: - $ref: '#/components/schemas/DateTimeRo' - endTime: - $ref: '#/components/schemas/DateTimeRo' - - type: object - properties: - startTime: - $ref: '#/components/schemas/DateTimeRo' - - type: object - properties: - endTime: - $ref: '#/components/schemas/DateTimeRo' + description: This datatype is used for readOnly attribute + type: object + properties: + startTime: + $ref: '#/components/schemas/DateTimeRo' + endTime: + $ref: '#/components/schemas/DateTimeRo' GeoCoordinate: type: object properties: diff --git a/OpenAPI/TS28623_FeatureNrm.yaml b/OpenAPI/TS28623_FeatureNrm.yaml index 3171f4557d1c3e3d1f01e66a25fbfbdaa53a0286..7a37deb97ebd5a3b233bb003c1d2c281f3047f60 100644 --- a/OpenAPI/TS28623_FeatureNrm.yaml +++ b/OpenAPI/TS28623_FeatureNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: NRM Feautres - version: 19.0.0 + version: 19.4.0 description: >- OAS 3.0.1 definition of the Features of NRM © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -36,5 +36,6 @@ components: - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/resources-subscriptionControlNrm' - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/resources-thresholdMonitorNrm' - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/resources-traceControlNrm' + - $ref: 'TS28310_EnergyInformationNrm.yaml#/components/schemas/resources-energyInformationNrm' #----- Definitions in TS 28.623 for TS 28.532 --------------------------# diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 89d1d35e8052cbcb194a4103d78398aedb8f89fb..8d054aa95d0127c4c046bb1710e3a68b2d9c3369 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Generic NRM - version: 19.2.0 + version: 19.4.0 description: >- OAS 3.0.1 definition of the Generic NRM - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.623; Generic NRM @@ -16,7 +16,9 @@ components: #-------- Definition of types----------------------------------------------------- - VnfParameter: + VnfParameters: + description: -> + This <> represents the parameter set of the VNF instance(s) corresponding to an NE. type: object properties: vnfInstanceId: @@ -27,13 +29,14 @@ components: type: string autoScalable: type: boolean - PeeParameter: + default: FALSE + PeeParameters: + description: -> + This <> represents the parameter list for the control and monitoring of power, energy and environmental parameters. type: object properties: siteIdentification: type: string - siteDescription: - type: string siteLatitude: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Latitude' siteLongitude: @@ -41,13 +44,14 @@ components: siteAltitude: type: number format: float + siteDescription: + type: string equipmentType: type: string environmentType: type: string powerInterface: type: string - TransportProtocol: anyOf: - type: string @@ -414,12 +418,12 @@ components: type: array uniqueItems: true items: - $ref: '#/components/schemas/VnfParameter' + $ref: '#/components/schemas/VnfParameters' peeParametersList: type: array uniqueItems: true items: - $ref: '#/components/schemas/PeeParameter' + $ref: '#/components/schemas/PeeParameters' priorityLabel: type: integer supportedPerfMetricGroups: @@ -604,7 +608,7 @@ components: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/SubNetwork-ncO-NrNrm' - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/SubNetwork-ncO-5GcNrm' - $ref: 'TS28318_DsoNrm.yaml#/components/schemas/SubNetwork-ncO-DsoNrm' - + - $ref: 'TS28310_EnergyInformationNrm.yaml#/components/schemas/SubNetwork-ncO-EnergyInformationNrm' ManagedElement-Single: allOf: diff --git a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml index 9424693be95af42123017d9866bbbe12502edb42..5f3a20de4375fc6da9eed558f58a2ce7974e6c28 100644 --- a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml +++ b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Management Data Collection NRM - version: 19.0.0 + version: 19.4.0 description: >- OAS 3.0.1 definition of the Management Data Collection NRM fragment - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.623; Generic NRM, Management Data Collection NRM @@ -18,6 +18,8 @@ components: properties: ManagementDataCollection: $ref: '#/components/schemas/ManagementDataCollection-Multiple' + ExternalDataType: + $ref: '#/components/schemas/ExternalDataType-Multiple' #-------Definition of generic IOCs ----------# @@ -54,6 +56,31 @@ components: - UP sst: type: integer + objectInstances: + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + ExternalDataScope: + type: object + properties: + geoAreas: + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + objectInstancesIncluded: + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + objectInstancesExcluded: + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + #-------- Definition of concrete IOCs -------------------------------------------- ManagementDataCollection-Single: @@ -78,16 +105,52 @@ components: - SNSSAI - 5QI - PLMN + condition: + type: string + processMonitor: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor' + consolidateOutput: + type: boolean + jobId: + type: string + + ExternalDataType-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + externalDataType: + type: string + mediaLocation: + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' + externalDataTypeSchema: + type: string + externalDataScope: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/ExternalDataScope' #-------- Definition of YAML arrays for name-contained IOCs ---------------------- ManagementDataCollection-Multiple: type: array items: $ref: '#/components/schemas/ManagementDataCollection-Single' - + + ExternalDataType-Multiple: + type: array + items: + $ref: '#/components/schemas/ExternalDataType-Single' #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- resources-mgmtDataCollectionNrm: oneOf: - $ref: '#/components/schemas/ManagementDataCollection-Single' + - $ref: '#/components/schemas/ExternalDataType-Single' diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index 70e245c10285dfb6ea2ff55e24f72ca2a629f6f3..cfaceb325a99d8ffbac8766ae5ccbbaa8a167880 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.3.0 + version: 19.4.0 description: >- OAS 3.0.1 definition of the MnS Registry NRM fragment © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -22,7 +22,38 @@ components: #-------Definition of generic IOCs ----------# #-------- Definition of types----------------------------------------------------- - + MnsCapability: + type: string + enum: + - NR_PROVISIONING + - 5GC_PROVISIONING + - NETWORK_SLICING_PROVISIONING + - EDGE_COMPUTING_PROVISIONING + - PERFORMANCE_METRIC_COLLECTION_CONTROL + - PERFORMANCE_METRIC_DATA_REPORT + - PERFORMANCE_METRIC_THRESHOLD_MONITOR_CONTROL + - PERFORMANCE_METRIC_THRESHOLD_NOTIFICATION + - FAULT_CONTROL + - FAULT_NOTIFICATION + - TRACE_MDT_DATA_COLLECTION_CONTROL + - TRACE_MDT_DATA_REPORT + - QOE_DATA_COLLECTION_CONTROL + - QOE_DATA_REPORT + - FILE_RETRIEVAL + - FILE_DOWNLOAD + - SUBSCRIPTION_CONTROL + - HEARTBEAT_CONTROL + - HEARTBEAT_NOTIFICATION + - ML_MODEL_MANAGEMENT + - MANAGEMENT DATA ANALYTIC + - RANSC_MANAGEMENT + - SON_POLICY + - COMMUNICATION_SERVICE_ASSURANCE_CONTROL + - INTENT_DRIVEN_MANAGEMENT + - ML_MODEL_MANAGEMENT + - MNS_REGISTRY_AND_DISCOVERY + - MNS_ACCESS_CONTROL_MANAGEMENT + - DSO_RAPID_RECOVERY_AND_THRESHOLD MONITORING #-------- Definition of concrete IOCs -------------------------------------------- MnsRegistry-Single: allOf: @@ -31,6 +62,8 @@ components: properties: MnsInfo: $ref: '#/components/schemas/MnsInfo-Multiple' + MgmtDataInfo: + $ref: '#/components/schemas/MgmtDataInfo-Multiple' MnsInfo-Single: allOf: @@ -51,17 +84,113 @@ components: mnsAddress: description: Resource URI as defined in the relevant Technical Specification $ref: 'TS28623_ComDefs.yaml#/components/schemas/UriRo' + mnsCapability: + description: >- + It describes the types of management capabilities of the MnS instance provided by the MnS producer. + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/MnsCapability' mnsScope: description: >- - List of the managed object instances that can be accessed using the MnS. - If a complete SubNetwork can be accessed using the MnS, this attribute may - contain the DN of the SubNetwork instead of the DNs of the individual managed - entities within the SubNetwork. + It is used to provide information about the management scope of the Management Service. The management scope is + used to represent the set of managed object instances that can be accessed using the Management Service. type: array uniqueItems: true items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: '#/components/schemas/MnsScope' minItems: 1 + mgmtDataInfoRef: + description: >- + List of DN of MgmtDataInfo instance(s) which are associated the MnSInfo which represent a + management service instance + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + uniqueItems: true + minItems: 1 + + MnsScope: + description: -> + It defines the information about the management scope of the Management Service. + oneOf: + - type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + - type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + - type: array + uniqueItems: true + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' + + MgmtDataInfo-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + supportedManagementData: + description: >- + It defines the list of management data that can be supported. + type: array + uniqueItems: true + items: + $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/ManagementData' + supportedGranularityPeriods: + description: >- + Granularity periods supported for the production of associated management data. + The period is defined in seconds. + type: array + items: + type: integer + uniqueItems: true + supportedReportingPeriods: + description: >- + Reporting periods supported for the associated management data. + The period is defined in seconds. + type: array + items: + type: integer + uniqueItems: true + historicalDataPeriod: + description: >- + This attribute describes the maximum period of the requested + historical data. + The period is defined in seconds. + When the value of this attribute is NULL, which means the + capability of querying historical data is not supported. + type: integer + supportedReportingMethod: + description: >- + List of supported reporting methods for the associated + management data. + type: array + uniqueItems: true + items: + type: string + enum: + - FILE + - STREAM + minItems: 1 + supportedDataScope: + description: >- + List of supported sub counter capabilities for the associated management data. + type: array + uniqueItems: true + items: + type: string + enum: + - SNSSAI + - 5QI + - PLMN + minItems: 1 + supportedDataRequestMnSRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + supportedDataReportingMnSRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' #-------- Definition of YAML arrays for name-contained IOCs ---------------------- @@ -70,9 +199,14 @@ components: items: $ref: '#/components/schemas/MnsInfo-Single' + MgmtDataInfo-Multiple: + type: array + items: + $ref: '#/components/schemas/MgmtDataInfo-Single' #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- resources-mnSRegistryNrm: oneOf: - $ref: '#/components/schemas/MnsInfo-Single' - $ref: '#/components/schemas/MnsRegistry-Single' + - $ref: '#/components/schemas/MgmtDataInfo-Single' \ No newline at end of file diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml index 83b75c6b60b158f834c6bd7a703e4569a5753790..3e82a68ed3ba17326872524fef05c871df25afe4 100644 --- a/OpenAPI/TS28623_SubscriptionControlNrm.yaml +++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Subscription Control NRM - version: 19.2.0 + version: 19.4.0 description: >- OAS 3.0.1 definition of the Subscription Control NRM fragment - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.623; Generic NRM, Subscription Control NRM @@ -83,7 +83,7 @@ components: triggerHeartbeatNtf: type: boolean default: FALSE - + writeOnly: true #-------- Definition of YAML arrays for name-contained IOCs ---------------------- NtfSubscriptionControl-Multiple: type: array