diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index c229cc7d83a8e88075b1297a3beca6855b6a42f1..3071fa954d85607a442de34677c2801e8f74147d 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: MDA NRM - version: 18.4.0 + version: 18.7.0 description: >- OAS 3.0.1 specification of the MDA 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.104; MDA @@ -14,11 +14,29 @@ components: schemas: #-------- Definition of types----------------------------------------------------- - + MDAType: + type: string + enum: + - COVERAGEANALYTICS_COVERAGEPROBLEMANALYSIS + - COVERAGEANALYTICS_PAGINGOPTIMIZATION + - SLSANALYSIS_SERVICEEXPERIENCEANALYSIS + - SLSANALYSIS_NETWORKSLICETHROUGHPUTANALYSIS + - SLSANALYSIS_NETWORKSLICETRAFFICANALYSIS + - SLSANALYSIS_E2ELATENCYANALYSIS + - SLSANALYSIS_NETWORKSLICELOADANALYSIS + - MDAASSISTEDFAULTMANAGEMENT_FAILUREPREDICTION + - MDAASSISTEDENERGYSAVING_ENERGYSAVINGANALYSIS + - MOBILITYMANAGEMENTANALYTICS_MOBILITYPERFORMANCEANALYSIS + - MOBILITYMANAGEMENTANALYTICS_HANDOVEROPTIMIZATION + - MAINTENANCE_MAINTENANCEANALYTICS + - RESOURCEANALYTICS_VIRTUALIZEDRESOURCEUTILIZATIONANALYSISNF + - RESOURCEANALYTICS_PHYISCALRESOURCEUTILIZATIONANALYSISNF + - RESOURCEANALYTICS_5GCCONTROLPLANECONGESTIONANALYSIS + - PREDICTIONS_PMDATA MDATypes: type: array items: - type: string + $ref: '#/components/schemas/MDAType' MDAOutputs: type: array @@ -34,14 +52,15 @@ components: - type: object properties: areaScope: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' - + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' MDAOutputPerMDAType: type: object properties: mDAType: - type: string + $ref: '#/components/schemas/MDAType' mDAOutputIEFilters: type: array items: @@ -55,7 +74,9 @@ components: filterValue: type: string threshold: - $ref: '#/components/schemas/ThresholdInfo' + type: array + items: + $ref: '#/components/schemas/ThresholdInfo' analyticsPeriod: $ref: '#/components/schemas/AnalyticsSchedule' timeOut: @@ -107,6 +128,7 @@ components: format: float minimum: 0 + #-------- Definition of types for name-containments ------ SubNetwork-ncO-MdaNrm: type: object @@ -138,15 +160,17 @@ components: properties: supportedMDACapabilities: $ref: '#/components/schemas/MDATypes' - mlModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - aIMLInferenceFunctionRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + mLModelRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + aIMLInferenceFunctionRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: MDARequest: $ref: '#/components/schemas/MDARequest-Multiple' + MDAReport: + $ref: '#/components/schemas/MDAReport-Multiple' MDARequest-Single: allOf: diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index b57be4d1a8e53fd04bfad327601642a4218f4884..ae1b0c0ad64b88c699be7ef4f284600e996ed651 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: MDA Report - version: 18.3.0 + version: 18.7.0 description: >- OAS 3.0.1 specification of the MDA Report - © 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.104; MDA Report @@ -19,7 +19,7 @@ components: type: object properties: mDAType: - type: string + $ref: 'TS28104_MdaNrm.yaml#/components/schemas/MDAType' mDAOutputList: type: array items: @@ -61,6 +61,8 @@ components: mDAReportID: type: string mDAOutputs: - $ref: '#/components/schemas/MDAOutputs' + type: array + items: + $ref: '#/components/schemas/MDAOutputs' mDARequestRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 7566d90a21594f143cf809d49baa0f4239ab2235..efdbbf51fc94bda85cac3d573c75b735e224db30 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: AI/ML NRM - version: 18.4.0 + version: 18.7.0 description: >- OAS 3.0.1 specification of the AI/ML 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.105; AI/ML Management @@ -18,7 +18,7 @@ components: MLContext: type: object properties: - inferenceModelRef: + inferenceEntityRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' dataProviderRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' @@ -110,7 +110,7 @@ components: type: object properties: aIMLInferenceName: - type: string + $ref: '#/components/schemas/AIMLInferenceName' capabilityName: type: string mLCapabilityParameters: @@ -141,7 +141,7 @@ components: items: type: string aIMLInferenceName: - type: string + $ref: '#/components/schemas/AIMLInferenceName' inferenceOutputTime: type: array items: @@ -152,7 +152,22 @@ components: outputResult: description: A map (list of key-value pairs) for Inference result name and it's value $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' - + AIMLInferenceName: + oneOf: + - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/MDAType' + - $ref: '#/components/schemas/NwdafAnalyticsType' + - $ref: '#/components/schemas/NgRanInferenceType' + - $ref: '#/components/schemas/VSExtensionType' + NwdafAnalyticsType: + $ref: 'TS29520_Nnwdaf_EventsSubscription.yaml#/components/schemas/NwdafEvent' + NgRanInferenceType: + type: string + enum: + - NG_RAN_NETWORK_ENERGY_SAVING + - NG_RAN_LOAD_BALANCING + - NG_RAN_ MOBILITY_OPTIMIZATION + VSExtensionType: + type: string #-------- Definition of types for name-containments ------ SubNetwork-ncO-AiMlNrm: type: object @@ -226,7 +241,7 @@ components: - type: object properties: aIMLInferenceName: - type: string + $ref: '#/components/schemas/AIMLInferenceName' candidateTrainingDataSource: type: array items: @@ -234,7 +249,9 @@ components: trainingDataQualityScore: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' trainingRequestSource: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + oneOf: + - type: string + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' requestStatus: $ref: '#/components/schemas/RequestStatus' expectedRuntimeContext: @@ -279,6 +296,9 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' mLModelRef: ## Figure 7.3a.1.1.1-1 is 1-0..1 mapping, hence should be single $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + mLModelCoordinationGroupRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + MLTrainingReport-Single: allOf: @@ -348,9 +368,6 @@ components: attributes: allOf: - type: object - oneOf: - - required: [ requestStatus, mLModelToTestRef ] - - required: [ requestStatus, mLModelCoordinationGroupToTestRef ] properties: requestStatus: $ref: '#/components/schemas/RequestStatus' @@ -358,9 +375,9 @@ components: type: boolean suspendRequest: type: boolean - mLModelToTestRef: + mLModelRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - mLModelCoordinationGroupToTestRef: + mLModelCoordinationGroupRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLTestingReport-Single: @@ -409,7 +426,7 @@ components: - type: object properties: aIMLInferenceName: - type: string + $ref: '#/components/schemas/AIMLInferenceName' policyForLoading: $ref: '#/components/schemas/AIMLManagementPolicy' mLModelRef: @@ -448,7 +465,7 @@ components: mLModelId: type: string aIMLInferenceName: - type: string + $ref: '#/components/schemas/AIMLInferenceName' mLModelVersion: type: string expectedRunTimeContext: @@ -458,7 +475,9 @@ components: runTimeContext: $ref: '#/components/schemas/MLContext' supportedPerformanceIndicators: - $ref: '#/components/schemas/SupportedPerfIndicator' + type: array + items: + $ref: '#/components/schemas/SupportedPerfIndicator' mLCapabilitiesInfoList: type: array items: @@ -467,6 +486,10 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' sourceTrainedMLModelRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + aIMLInferenceReportRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + usedByFunctionRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' MLModelRepository-Single: allOf: @@ -542,7 +565,7 @@ components: type: boolean mLUpdateProcessRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - mLModelRef: + mLModelRefList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' MLUpdateProcess-Single: @@ -555,9 +578,13 @@ components: properties: progressStatus: $ref: '#/components/schemas/ProcessMonitor' - mLModelRef: + cancelProcess: + type: boolean + suspendProcess: + type: boolean + mLModelRefList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - mLUpdateRequestRef: + mLUpdateRequestRefList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' mLUpdateReportRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' @@ -572,7 +599,7 @@ components: properties: updatedMLCapability: $ref: '#/components/schemas/AvailMLCapabilityReport' - mLModelRef: + mLModelRefList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' mLUpdateProcessRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' @@ -596,7 +623,7 @@ components: $ref: '#/components/schemas/AIMLManagementPolicy' usedByFunctionRefList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - mLModelRef: + mLModelRefList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object @@ -626,7 +653,7 @@ components: items: $ref: '#/components/schemas/InferenceOutput' minItems: 1 - mLModelRef: + mLModelRefList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' AIMLInferenceEmulationFunction-Single: @@ -639,7 +666,7 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - type: object properties: - AIMLInferenceEmulationReport: + AIMLInferenceReport: $ref: '#/components/schemas/AIMLInferenceReport-Multiple' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' diff --git a/OpenAPI/TS28111_FaultNrm.yaml b/OpenAPI/TS28111_FaultNrm.yaml index 7a525d13f635f975e14c2f0b5dd108cae8f18e59..94f1171896d2e79d7997c276c417e60f27da900a 100644 --- a/OpenAPI/TS28111_FaultNrm.yaml +++ b/OpenAPI/TS28111_FaultNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Fault Management NRM - version: 18.1.0 + version: 18.7.0 description: >- OAS 3.0.1 definition of the Fault Supervision 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.111; Fault Management @@ -40,24 +40,224 @@ components: - PHYSICAL_VIOLATION - SECURITY_SERVICE_OR_MECHANISM_VIOLATION - TIME_DOMAIN_VIOLATION + - OTHER ProbableCause: description: >- The value of the probable cause may be a specific standardized string, or any - vendor provided string. Probable cause strings are not standardized in the - present document. They may be added in a future version. Up to then the - mapping of the generic probable cause strings "PROBABLE_CAUSE_001" to - "PROBABLE_CAUSE_005" is vendor specific. + vendor provided string. The value of the probable cause may also be an integer. The mapping of integer values to probable causes is vendor specific. oneOf: - anyOf: - type: string + description: Values are from the (informative) Annex B of 3GPP TS 28.111. enum: - - PROBABLE_CAUSE_001 - - PROBABLE_CAUSE_002 - - PROBABLE_CAUSE_003 - - PROBABLE_CAUSE_004 - - PROBABLE_CAUSE_005 + - INDETERMINATE + - ALARM_INDICATION_SIGNAL + - CALL_SETUP_FAILURE + - DEGRADED_SIGNAL + - FAR_END_RECEIVER_FAILURE + - FRAMING_ERROR + - LOSS_OF_FRAME + - LOSS_OF_POINTER + - LOSS_OF_SIGNAL + - PAYLOAD_TYPE_MISMATCH + - REMOTE_ALARM_INTERFACE + - EXCESSIVE_BIT_ERROR_RATE + - PATH_TRACE_MISMATCH + - UNAVAILABLE + - SIGNAL_LABEL_MISMATCH + - LOSS_OF_MULTI_FRAME + - COMMUNICATIONS_RECEIVE_FAILURE + - COMMUNICATIONS_TRANSMIT_FAILURE + - MODULATION_FAILURE + - DEMODULATION_FAILURE + - BACK_PLANE_FAILURE + - DATA_SET_PROBLEM + - EQUIPMENT_IDENTIFIER_DUPLICATION + - EXTERNAL_IF_DEVICE_PROBLEM + - LINE_CARD_PROBLEM + - MULTIPLEXER_PROBLEM + - NE_IDENTIFIER_DUPLICATION + - POWER_PROBLEM + - PROCESSOR_PROBLEM + - PROTECTION_PATH_FAILURE + - RECEIVER_FAILURE + - REPLACEABLE_UNIT_MISSING + - REPLACEABLE_UNIT_TYPE_MISMATCH + - SYNCHRONIZATION_SOURCE_MISMATCH + - TERMINAL_PROBLEM + - TIMING_PROBLEM + - TRANSMITTER_FAILURE + - TRUNK_CARD_PROBLEM + - REPLACEABLE_UNIT_PROBLEM + - REAL_TIME_CLOCK_FAILURE + - PROTECTION_MECHANISM_FAILURE + - PROTECTING_RESOURCE_FAILURE + - AIR_COMPRESSOR_FAILURE + - AIR_CONDITIONING_FAILURE + - AIR_DRYER_FAILURE + - BATTERY_DISCHARGING + - BATTERY_FAILURE + - COMMERCIAL_POWER_FAILURE + - COOLING_FAN_FAILURE + - ENGINE_FAILURE + - FIRE_DETECTOR_FAILURE + - FUSE_FAILURE + - GENERATOR_FAILURE + - LOW_BATTERY_THRESHOLD + - PUMP_FAILURE + - RECTIFIER_FAILURE + - RECTIFIER_HIGH_VOLTAGE + - RECTIFIER_LOW_F_VOLTAGE + - VENTILATION_SYSTEM_FAILURE + - ENCLOSURE_DOOR_OPEN + - EXPLOSIVE_GAS + - FIRE + - FLOOD + - HIGH_HUMIDITY + - HIGH_TEMPERATURE + - HIGH_WIND + - ICE_BUILD_UP + - INTRUSION_DETECTION + - LOW_FUEL + - LOW_HUMIDITY + - LOW_CABLE_PRESSURE + - LOW_TEMPERATURE + - LOW_WATER + - SMOKE + - TOXIC_GAS + - EXTERNAL_POINT_FAILURE + - STORAGE_CAPACITY_PROBLEM + - MEMORY_MISMATCH + - CORRUPT_DATA + - OUT_OF_CPU_CYCLES + - SOFTWARE_ENVIRONMENT_PROBLEM + - SOFTWARE_DOWNLOAD_FAILURE + - LOSS_OF_REAL_TIME + - REINITIALIZED + - EXCESSIVE_ERROR_RATE + - ADAPTER_ERROR + - APPLICATION_SUBSYSTEM_FAILURE + - BANDWIDTH_REDUCED + - COMMUNICATIONS_PROTOCOL_ERROR + - COMMUNICATIONS_SUBSYSTEM_FAILURE + - CONFIGURATION_OR_CUSTOMIZATION_ERROR + - CONGESTION + - CPU_CYCLES_LIMIT_EXCEEDED + - DATA_SET_OR_MODEM_ERROR + - DTE_DCE_INTERFACE_ERROR + - EQUIPMENT_MALFUNCTION + - EXCESSIVE_VIBRATION + - FILE_ERROR + - HEATING_OR_VENTILATION_OR_COOLING_SYSTEM_PROBLEM + - HUMIDITY_UNACCEPTABLE + - INPUT_OUTPUT_DEVICE_ERROR + - INPUT_DEVICE_ERROR + - LAN_ERROR + - LEAK_DETECTED + - LOCAL_NODE_TRANSMISSION_ERROR + - MATERIAL_SUPPLY_EXHAUSTED + - OUT_OF_MEMORY + - OUTPUT_DEVICE_ERROR + - PERFORMANCE_DEGRADED + - PRESSURE_UNACCEPTABLE + - QUEUE_SIZE_EXCEEDED + - RECEIVE_FAILURE + - REMOTE_NODE_TRANSMISSION_ERROR + - RESOURCE_AT_OR_NEARING_CAPACITY + - RESPONSE_TIME_EXCESSIVE + - RETRANSMISSION_RATE_EXCESSIVE + - SOFTWARE_ERROR + - SOFTWARE_PROGRAM_ABNORMALLY_TERMINATED + - SOFTWARE_PROGRAM_ERROR + - TEMPERATURE_UNACCEPTABLE + - THRESHOLD_CROSSED + - TOXIC_LEAK_DETECTED + - TRANSMIT_FAILURE + - UNDERLYING_RESOURCE_UNAVAILABLE + - VERSION_MISMATCH + - A_BIS_TO_BTS_INTERFACE_FAILURE + - A_BIS_TO_TRX_INTERFACE_FAILURE + - ANTENNA_PROBLEM + - BATTERY_BREAKDOWN + - BATTERY_CHARGING_FAULT + - CLOCK_SYNCHRONIZATION_PROBLEM + - COMBINER_PROBLEM + - DISK_PROBLEM + - EXCESSIVE_RECEIVER_TEMPERATURE + - EXCESSIVE_TRANSMITTER_OUTPUT_POWER + - EXCESSIVE_TRANSMITTER_TEMPERATURE + - FREQUENCY_HOPPING_DEGRADED + - FREQUENCY_HOPPING_FAILURE + - FREQUENCY_REDEFINITION_FAILED + - LINE_INTERFACE_FAILURE + - LINK_FAILURE + - LOSS_OF_SYNCHRONIZATION + - LOST_REDUNDANCY + - MAINS_BREAKDOWN_WITH_BATTERY_BACKUP + - MAINS_BREAKDOWN_WITHOUT_BATTERY_BACKUP + - POWER_SUPPLY_FAILURE + - RECEIVER_ANTENNA_FAULT + - RECEIVER_MULTICOUPLER_FAILURE + - REDUCED_TRANSMITTER_OUTPUT_POWER + - SIGNAL_QUALITY_EVALUATION_FAULT + - TIMESLOT_HARDWARE_FAILURE + - TRANSCEIVER_PROBLEM + - TRANSCODER_PROBLEM + - TRANSCODER_OR_RATE_ADAPTER_PROBLEM + - TRANSMITTER_ANTENNA_FAILURE + - TRANSMITTER_ANTENNA_NOT_ADJUSTED + - TRANSMITTER_LOW_VOLTAGE_OR_CURRENT + - TRANSMITTER_OFF_FREQUENCY + - DATABASE_INCONSISTENCY + - FILE_SYSTEM_CALL_UNSUCCESSFUL + - INPUT_PARAMETER_OUT_OF_RANGE + - INVALID_PARAMETER + - INVALID_POINTER + - MESSAGE_NOT_EXPECTED + - MESSAGE_NOT_INITIALIZED + - MESSAGE_OUT_OF_SEQUENCE + - SYSTEM_CALL_UNSUCCESSFUL + - TIMEOUT_EXPIRED + - VARIABLE_OUT_OF_RANGE + - WATCH_DOG_TIMER_EXPIRED + - COOLING_SYSTEM_FAILURE + - EXTERNAL_EQUIPMENT_FAILURE + - EXTERNAL_POWER_SUPPLY_FAILURE + - EXTERNAL_TRANSMISSION_DEVICE_FAILURE + - REDUCED_ALARM_REPORTING + - REDUCED_EVENT_REPORTING + - REDUCED_LOGGING_CAPABILITY + - SYSTEM_RESOURCES_OVERLOAD + - BROADCAST_CHANNEL_FAILURE + - CONNECTION_ESTABLISHMENT_ERROR + - INVALID_MESSAGE_RECEIVED + - INVALID_MSU_RECEIVED + - LAPD_LINK_PROTOCOL_FAILURE + - LOCAL_ALARM_INDICATION + - REMOTE_ALARM_INDICATION + - ROUTING_FAILURE + - SS7_PROTOCOL_FAILURE + - TRANSMISSION_ERROR + - AUTHENTICATION_FAILURE + - BREACH_OF_CONFIDENTIALITY + - CABLE_TAMPER + - DELAYED_INFORMATION + - DENIAL_OF_SERVICE + - DUPLICATE_INFORMATION + - INFORMATION_MISSING + - INFORMATION_MODIFICATION_DETECTED + - INFORMATION_OUT_OF_SEQUENCE + - INTRUSION_DETECTED + - KEY_EXPIRED + - NON_REPUDIATION_FAILURE + - OUT_OF_HOURS_ACTIVITY + - OUT_OF_SERVICE + - PROCEDURAL_ERROR + - UNAUTHORISED_ACCESS_ATTEMPT + - UNEXPECTED_INFORMATION + - UNSPECIFIED_REASON - type: string - type: integer SpecificProblem: @@ -100,7 +300,7 @@ components: properties: down: $ref: '#/components/schemas/ThresholdHysteresis' - ThresholdInfo: + ThresholdCrossing: type: object properties: observedMeasurement: @@ -169,7 +369,7 @@ components: trendIndication: $ref: '#/components/schemas/TrendIndication' thresholdinfo: - $ref: '#/components/schemas/ThresholdInfo' + $ref: '#/components/schemas/ThresholdCrossing' correlatedNotifications: $ref: '#/components/schemas/CorrelatedNotifications' stateChangeDefinition: @@ -280,7 +480,7 @@ components: trendIndication: $ref: '#/components/schemas/TrendIndication' thresholdInfo: - $ref: '#/components/schemas/ThresholdInfo' + $ref: '#/components/schemas/ThresholdCrossing' correlatedNotifications: $ref: '#/components/schemas/CorrelatedNotifications' stateChangeDefinition: @@ -401,7 +601,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/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index dc5c4d4e48ca9d7641779bc7bd27ebe49288c5ec..f353412f6ad4a8eb06c538ffdfd596f80dc0bd43 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Intent NRM - version: 18.4.0 + version: 18.6.0 description: >- OAS 3.0.1 definition of the Intent NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -64,10 +64,7 @@ components: maximum: 100 description: It expresses the priority of the stated intent within a MnS consumer. intentPreemptionCapability: - type: string - enum: - - TRUE - - FALSE + type: boolean observationPeriod: type: integer description: >- @@ -327,7 +324,7 @@ components: properties: intentFulfilmentInfo: $ref: '#/components/schemas/FulfilmentInfo' - expectationFulfilmentResult: + expectationFulfilmentResults: type: array items: $ref: '#/components/schemas/ExpectationFulfilmentResult' @@ -343,7 +340,7 @@ components: type: string expectationFulfilmentInfo: $ref: '#/components/schemas/FulfilmentInfo' - targetFulfilmentResult: + targetFulfilmentResults: type: array items: $ref: '#/components/schemas/TargetFulfilmentResult' @@ -413,9 +410,15 @@ components: enum: - FEASIBLE - INFEASIBLE - infeasibilityReason: - type: string - description: An attribute which is used when feasibilityCheckResult is INFEASIBLE + infeasibilityReasons: + description: An attribute which is used when feasibilityCheckResult is INFEASIBLE + type: array + items: + type: string + readOnly: true + enum: + - INVALID_INTENT_EXPRESSION + - INTENT_CONFLICT #-------Definition of the concrete IntentFeasibilityCheckReport dataType----------------# #-------Definition of the generic IntentHandlingCapability dataType----------------# diff --git a/OpenAPI/TS28318_DsoNrm.yaml b/OpenAPI/TS28318_DsoNrm.yaml index 7246dca06f5339830621ae57777da15147215f37..41968fa51b0ac00a8555e73a48fd104760293f3f 100644 --- a/OpenAPI/TS28318_DsoNrm.yaml +++ b/OpenAPI/TS28318_DsoNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: 3GPP NRM - version: 18.1.0 + version: 18.2.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_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 116dfc4b7d44bcd8df8eafb2f94fadb728a982fa..8c64a1a6524960dabf79ce7b5f0e73fc3fda83df 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Provisioning MnS - version: 18.3.0 + version: 18.6.0 description: >- OAS 3.0.1 definition of the Provisioning MnS © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -219,7 +219,7 @@ paths: are targeted. required: false schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexConditions' - name: attributes in: query description: >- @@ -251,7 +251,10 @@ paths: select data nodes. required: false schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter' + oneOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionBasic' + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionAdvanced' + responses: '200': description: >- @@ -346,9 +349,15 @@ paths: responses: '200': description: >- + The response code is deprecated. Use 204 instead. Success case ("200 OK"). This status code is returned, when the resource has been successfully deleted. The response body is empty. + '204': + description: >- + Success case ("204 No Content"). + This status code is returned, when the resource has been successfully deleted. + The response body is empty. default: description: Error case. content: diff --git a/OpenAPI/TS28536_CoslaNrm.yaml b/OpenAPI/TS28536_CoslaNrm.yaml index a81e08261fc6cd845e072718fccae9bdee4553ce..1efd9ca6de95fb338ceba3ce85e3090b83674094 100755 --- a/OpenAPI/TS28536_CoslaNrm.yaml +++ b/OpenAPI/TS28536_CoslaNrm.yaml @@ -2,7 +2,7 @@ openapi: 3.0.1 info: title: coslaNrm - version: 18.1.0 + version: 18.3.0 description: >- OAS 3.0.1 specification of the Cosla NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -84,6 +84,8 @@ components: $ref: '#/components/schemas/AssuranceGoalStatusPredicted' assuranceGoalRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + assuranceTargetStatusList: + $ref: '#/components/schemas/AssuranceTargetStatusList' AssuranceGoalStatusList: type: array @@ -155,13 +157,17 @@ components: controlLoopLifeCyclePhase: $ref: '#/components/schemas/ControlLoopLifeCyclePhase' aCCLDisallowedList: - $ref: '#/components/schemas/ACCLDisallowedAttributes' + type: array + items: + $ref: '#/components/schemas/ACCLDisallowedAttributes' + networkSliceRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + networkSliceSubnetRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + AssuranceReport: + $ref: '#/components/schemas/AssuranceReport-Single' AssuranceGoal: $ref: '#/components/schemas/AssuranceGoal-Multiple' - networkSliceRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - networkSliceSubnetRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' AssuranceGoal-Single: allOf: diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 0848b77d43bfaeb0f655cfe23151d47ccfde4018..919cf25b4afd8bd899af1cd1eb6d355545bbf154 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP Edge NRM - version: 18.7.0 + version: 18.9.0 description: >- OAS 3.0.1 specification of the Edge NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -88,6 +88,17 @@ components: type: string swImageRef: type: string + RegistrationInfo: + type: object + properties: + registrationExpiry: + type: string + readOnly: true + registrationID: + type: string + readOnly: true + secCredential: + type: string Duration: type: object properties: @@ -110,6 +121,7 @@ components: enum: - ENABLED - DISABLED + - OVERLOAD_WARNING ResourceReservationRequirement: type: object properties: @@ -142,9 +154,11 @@ components: - FUTURE futuristicTriggerTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - AvailableEDNList: + AvailableEDN: type: object properties: + availableEDN: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' resourceQuota: $ref: '#/components/schemas/VirtualResource' FederatedECSInfo: @@ -205,6 +219,8 @@ components: type: array items: type: string + registrationInfo: + $ref: '#/components/schemas/RegistrationInfo' eASRequirementsRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' eASAddress: @@ -271,6 +287,9 @@ components: type: boolean eASFunctionRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + registrationInfo: + $ref: '#/components/schemas/RegistrationInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' ECSFunction-Single: @@ -369,8 +388,10 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' leadingOPiD: type: string - avaibleEDNList: - $ref: '#/components/schemas/AvailableEDNList' + availableEDNList: + type: array + items: + $ref: '#/components/schemas/AvailableEDN' acceptedEDN: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' OperatorEdgeDataNetwork-Single: diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 44dc93e1c80245cd60b6bdd8aef483b28055fe5b..73fc83dfeb60a29c4d6711b55990a449ec04eee6 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: 3GPP 5GC NRM - version: 18.8.0 + version: 18.12.0 description: >- OAS 3.0.1 specification of the 5GC 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.541; 5G NRM, 5GC NRM @@ -59,17 +59,21 @@ components: type: object description: 'NF profile stored in NRF, defined in TS 29.510' properties: - nFInstanceId: + nfInstanceId: type: string description: uuid of NF instance - nFType: + nfType: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' - nFStatus: + nfStatus: $ref: '#/components/schemas/NFStatus' plmn: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' sNssais: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' + type: array + items: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' fqdn: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' interPlmnFqdn: @@ -86,8 +90,10 @@ components: type: string serviceName: type: string - version: - type: string + versions: + type: array + items: + type: string schema: type: string fqdn: @@ -98,15 +104,17 @@ components: type: array items: $ref: '#/components/schemas/IpEndPoint' - apiPrfix: + apiPrefix: type: string - allowedPlmns: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + allowedPlMNs: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' allowedNfTypes: type: array items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' - allowedNssais: + allowedNSSAIs: type: array items: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' @@ -139,8 +147,6 @@ components: type: array items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' - WeightFactor: - type: integer VendorId: type: string description: Vendor ID of the NF Service instance (Private Enterprise Number assigned by IANA) @@ -215,8 +221,10 @@ components: ManagedNFProfile: type: object properties: - nfInstanceID: + nfInstanceId: type: string + interPlmnFqdn: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' nfType: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' heartbeatTimer: @@ -787,12 +795,10 @@ components: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' - minItems: 1 ipv6EndpointAddresses: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' - minItems: 1 fqdn: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' networkInstance: @@ -812,9 +818,13 @@ components: type: object properties: ipv4EndpointAddresses: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' ipv6EndpointAddresses: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' fqdn: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' @@ -1602,13 +1612,13 @@ components: description: Information of an AMF NF Instance type: object required: - - amfSetId - - amfRegionId + - aMFSetId + - aMFRegionId - guamiList properties: - amfSetId: + aMFSetId: $ref: 'TS29571_CommonData.yaml#/components/schemas/AmfSetId' - amfRegionId: + aMFRegionId: $ref: 'TS29571_CommonData.yaml#/components/schemas/AmfRegionId' guamiList: type: array @@ -2258,9 +2268,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: @@ -2277,18 +2287,18 @@ components: geoSatelliteId: type: string pattern: '^[0-9]{5}$' - GlobalRanNodeID: + NTNGlobalRanNodeID: description: globally identification of an NG-RAN node type: object oneOf: - - required: [ pLmnId, n3IwfId] - - required: [ plmnId, gNbId] - - required: [ pLmnId, ngeNbId] - - required: [ plmnId, wagfId] - - required: [ pLmnId, tngfId] - - required: [ plmnId, twifId] + - required: [ pLMNId, n3IwfId] + - required: [ plMNId, gNbId] + - required: [ pLMNId, ngeNbId] + - required: [ plMNId, wagfId] + - required: [ pLMNId, tngfId] + - required: [ plMNId, twifId] properties: - pLmnId: + pLMNId: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' n3IwfId: type: string @@ -2307,7 +2317,12 @@ components: type: string pattern: '^[A-Fa-f0-9]+$' twifId: - type: string + type: string + NTNPLMNRestrictionsList: + description: NTNPLMNRestrictionsInfoList that relates to non-terrestrial network access + type: array + items: + $ref: '#/components/schemas/NTNPLMNRestrictionsInfo' NTNPLMNRestrictionsInfo: description: restrictions per PLMN that relates to non-terrestrial network access type: object @@ -2317,34 +2332,62 @@ components: blockedLocationInfoList: type: array items: - $ref: '#/components/schemas/BlockedLocationInfoList' - minItems: 1 - BlockedLocationInfoList: + $ref: '#/components/schemas/BlockedLocationInfo' + BlockedLocationInfo: description: location for which the PLMN access restrictions are to be applied in case of NTN type: object properties: blockedLocation: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' - blockedDur: - $ref: '#/components/schemas/TimeDuration' + blockedDurWindow: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' blockedSlice: - type: string - TimeDuration: - description: location for which the PLMN access restrictions are to be applied in case of NTN + $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' + SatelliteCoverageInfoList: + description: SatelliteCoverageInfoList that relates to NR Satellite RAT type and corresponding information of satellite coverage + type: array + items: + $ref: '#/components/schemas/SatelliteCoverageInfo' + SatelliteCoverageInfo: + description: This datatype defines information related to NR Satellite RAT type and corresponding information of satellite coverage type: object properties: - blockedDurStartTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - blockedDurEndTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - + nRSatelliteRATtype: + anyOf: + - type: string + enum: + - NRLEO + - NRMEO + - NRGEO + - NROTHERSAT + - type: string + locationInfo: + type: array + items: + $ref: '#/components/schemas/NtnLocationInfo' + NtnLocationInfo: + description: This datatype defines the information about locations and corresponding time windows + type: object + properties: + location: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + availabilityWindows: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + nonAvailabilityWindows: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' 5GDdnmfInfo: description: Information of an 5G DDNMF NF Instance type: object required: - - plmnId + - plMNId properties: - plmnId: + plMNId: $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId' ImsiRange: description: > @@ -2563,7 +2606,7 @@ components: mbsServiceIdEnd: type: string pattern: '^[A-Fa-f0-9]{6}$' - plmnId: + plMNId: $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId' nid: $ref: 'TS29571_CommonData.yaml#/components/schemas/Nid' @@ -2618,7 +2661,7 @@ components: type: string pattern: '^[A-Fa-f0-9]{6}$' description: MBS Service ID - plmnId: + plMNId: $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId' required: - mbsServiceId @@ -2676,7 +2719,7 @@ components: description: Contains the NCGI (NR Cell Global Identity), as described in 3GPP 23.003 type: object properties: - plmnId: + plMNId: $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId' nrCellId: type: string @@ -2795,42 +2838,34 @@ components: type: array items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' - minItems: 1 pduSessionTypes: type: array items: $ref: 'TS29571_CommonData.yaml#/components/schemas/PduSessionType' - minItems: 1 ipv4AddressRanges: type: array items: $ref: '#/components/schemas/Ipv4AddressRange' - minItems: 1 ipv6PrefixRanges: type: array items: $ref: '#/components/schemas/Ipv6PrefixRange' - minItems: 1 natedIpv4AddressRanges: type: array items: $ref: '#/components/schemas/Ipv4AddressRange' - minItems: 1 natedIpv6PrefixRanges: type: array items: $ref: '#/components/schemas/Ipv6PrefixRange' - minItems: 1 ipv4IndexList: type: array items: $ref: '#/components/schemas/IpIndex' - minItems: 1 ipv6IndexList: type: array items: $ref: '#/components/schemas/IpIndex' - minItems: 1 networkInstance: description: > The N6 Network Instance associated with the S-NSSAI and DNN. @@ -3030,10 +3065,6 @@ components: $ref: '#/components/schemas/AmfIdentifier' sBIFqdn: type: string - interPlmnFQDN: - type: string - weightFactor: - $ref: '#/components/schemas/WeightFactor' cNSIIdList: $ref: '#/components/schemas/CNSIIdList' amfSetRef: @@ -3042,14 +3073,19 @@ components: $ref: '#/components/schemas/ManagedNFProfile' commModelList: $ref: '#/components/schemas/CommModelList' - nTNPLMNInfoList: - $ref: '#/components/schemas/NTNPLMNRestrictionsInfo' + nTNPLMNRestrictionsList: + $ref: '#/components/schemas/NTNPLMNRestrictionsList' + satelliteCoverageInfoList: + $ref: '#/components/schemas/SatelliteCoverageInfoList' amfInfo: $ref: '#/components/schemas/AmfInfo' sliceExpiryInfo: $ref: '#/components/schemas/SliceExpiryInfo' - SatelliteBackhaulInfoList: - $ref: '#/components/schemas/SatelliteBackhaulInfo' + satelliteBackhaulInfoList: + type: array + items: + $ref: '#/components/schemas/SatelliteBackhaulInfo' + minItems: 1 mappedCellIdInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' mdtUserConsentReqList: @@ -3077,8 +3113,8 @@ components: $ref: '#/components/schemas/EP_N22-Multiple' EP_N26: $ref: '#/components/schemas/EP_N26-Multiple' - EP_NLS: - $ref: '#/components/schemas/EP_NLS-Multiple' + EP_NL1: + $ref: '#/components/schemas/EP_NL1-Multiple' EP_NL2: $ref: '#/components/schemas/EP_NL2-Multiple' EP_N58: @@ -3521,8 +3557,8 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: - EP_NLS: - $ref: '#/components/schemas/EP_NLS-Multiple' + EP_NL1: + $ref: '#/components/schemas/EP_NL1-Multiple' NgeirFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4267,7 +4303,7 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' - EP_NLS-Single: + EP_NL1-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -4447,7 +4483,7 @@ components: allOf: - type: object properties: - FiveQiDscpMappingList: + fiveQiDscpMappingList: type: array items: $ref: '#/components/schemas/FiveQiDscpMapping' @@ -4576,6 +4612,19 @@ components: type: integer qFMeasurementPeriod: type: integer + qFMonitoredSatelliteBackhaulCategories: + type: array + items: + $ref: '#/components/schemas/SatelliteBackhaulCategories' + + SatelliteBackhaulCategories: + type: string + description: any of enumerated value + enum: + - DYNAMIC_GEO + - DYNAMIC_MEO + - DYNAMIC_LEO + - DYNAMIC_OTHER_SAT PredefinedPccRuleSet-Single: allOf: @@ -4637,8 +4686,8 @@ components: type: string cNSIIdList: $ref: '#/components/schemas/CNSIIdList' - nFProfileList: - $ref: '#/components/schemas/NFProfileList' + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' commModelList: $ref: '#/components/schemas/CommModelList' nssafInfo: @@ -5259,6 +5308,10 @@ components: enum: - ACTIVATED - DEACTIVATED + mLModelRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + aIMLInferenceFunctionRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' EP_SM12-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -5549,10 +5602,10 @@ components: type: array items: $ref: '#/components/schemas/EP_MAP_SMSC-Single' - EP_NLS-Multiple: + EP_NL1-Multiple: type: array items: - $ref: '#/components/schemas/EP_NLS-Single' + $ref: '#/components/schemas/EP_NL1-Single' EP_NL2-Multiple: type: array items: @@ -5838,7 +5891,7 @@ components: - $ref: '#/components/schemas/EP_S5U-Single' - $ref: '#/components/schemas/EP_Rx-Single' - $ref: '#/components/schemas/EP_MAP_SMSC-Single' - - $ref: '#/components/schemas/EP_NLS-Single' + - $ref: '#/components/schemas/EP_NL1-Single' - $ref: '#/components/schemas/EP_NL2-Single' - $ref: '#/components/schemas/EP_NL3-Single' - $ref: '#/components/schemas/EP_NL5-Single' diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 62e23de93760987a78e011b7ca67c887b8be1dac..0c1387c89f0914eb62a815829bce1b664e13b09a 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: NR NRM - version: 18.8.0 + version: 18.13.0 description: >- OAS 3.0.1 specification of the NR 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.541; 5G NRM, NR NRM @@ -109,7 +109,7 @@ components: MappingSetIDBackhaulAddress: type: object properties: - setID: + setId: type: integer backhaulAddress: $ref: '#/components/schemas/BackhaulAddress' @@ -172,6 +172,7 @@ components: minimum: 0 maximum: 200 + UeAccDelayProbabilityDist: type: array items: @@ -237,10 +238,8 @@ components: CyclicPrefix: type: string enum: - - '15' - - '30' - - '60' - - '120' + - NORMAL, + - EXTENDED TxDirection: type: string enum: @@ -258,8 +257,6 @@ components: enum: - INITIAL - OTHER - - SUL - IsESCoveredBy: type: string enum: @@ -305,23 +302,9 @@ components: ipv6Address: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' - CellIndividualOffset: - type: object - properties: - rsrpOffsetSSB: - type: integer - rsrqOffsetSSB: - type: integer - sinrOffsetSSB: - type: integer - rsrpOffsetCSI-RS: - type: integer - rsrqOffsetCSI-RS: - type: integer - sinrOffsetCSI-RS: - type: integer QOffsetRange: type: integer + default: 0 enum: - -24 - -22 @@ -354,21 +337,6 @@ components: - 3 - 2 - 1 - QOffsetRangeList: - type: object - properties: - rsrpOffsetSSB: - $ref: '#/components/schemas/QOffsetRange' - rsrqOffsetSSB: - $ref: '#/components/schemas/QOffsetRange' - sinrOffsetSSB: - $ref: '#/components/schemas/QOffsetRange' - rsrpOffsetCSI-RS: - $ref: '#/components/schemas/QOffsetRange' - rsrqOffsetCSI-RS: - $ref: '#/components/schemas/QOffsetRange' - sinrOffsetCSI-RS: - $ref: '#/components/schemas/QOffsetRange' QOffsetFreq: type: number TReselectionNRSf: @@ -563,7 +531,7 @@ components: type: array items: $ref: '#/components/schemas/RimRSReportInfo' - TceMappingInfo: + TceIDMappingInfo: type: object properties: TceIPAddress: @@ -574,10 +542,10 @@ components: type: integer PlmnTarget: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' - TceMappingInfoList: + TceIDMappingInfoList: type: array items: - $ref: '#/components/schemas/TceMappingInfo' + $ref: '#/components/schemas/TceIDMappingInfo' ResourceType: type: string enum: @@ -593,12 +561,6 @@ components: type: integer minValue: type: integer - - NTNTAClist: - type: array - items: - $ref: '#/components/schemas/NrTac' - Ephemeris: type: object oneOf: @@ -759,7 +721,10 @@ components: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' CCOFunction: $ref: '#/components/schemas/CCOFunction-Single' - + NTNFunction: + $ref: '#/components/schemas/NTNFunction-Single' + NRECMappingRule: + $ref: '#/components/schemas/NRECMappingRule-Multiple' ManagedElement-ncO-NrNrm: type: object properties: @@ -787,6 +752,10 @@ components: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Configurable5QISet-Multiple' Dynamic5QISet: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' + NTNFunction: + $ref: '#/components/schemas/NTNFunction-Single' + NRECMappingRule: + $ref: '#/components/schemas/NRECMappingRule-Multiple' #-------- Definition of abstract IOCs -------------------------------------------- @@ -945,12 +914,14 @@ components: $ref: '#/components/schemas/GGnbIdList' x2HOBlockList: $ref: '#/components/schemas/GEnbIdList' - xnHOBlackList: + xnHOBlockList: $ref: '#/components/schemas/GGnbIdList' mappingSetIDBackhaulAddress: - $ref: '#/components/schemas/MappingSetIDBackhaulAddress' - tceMappingInfoList: - $ref: '#/components/schemas/TceMappingInfoList' + type: array + items: + $ref: '#/components/schemas/MappingSetIDBackhaulAddress' + tceIDMappingInfoList: + $ref: '#/components/schemas/TceIDMappingInfoList' configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: @@ -967,6 +938,8 @@ components: $ref: '#/components/schemas/QceIdMappingInfoList' mdtUserConsentReqList: $ref: '#/components/schemas/MdtUserConsentReqList' + nRECMappingRuleRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -996,6 +969,10 @@ components: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Configurable5QISet-Multiple' Dynamic5QISet: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' + NRNetwork: + $ref: '#/components/schemas/NRNetwork-Single' + EUtranNetwork: + $ref: '#/components/schemas/EUtraNetwork-Single' NrCellCu-Single: allOf: @@ -1102,9 +1079,9 @@ components: description: "Condition is BWP sets are supported" $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' rimRSMonitoringStartTime: - type: string + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' rimRSMonitoringStopTime: - type: string + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' rimRSMonitoringWindowDuration: type: integer rimRSMonitoringWindowStartingOffset: @@ -1136,7 +1113,7 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object properties: - bWPlist: + bWPList: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' @@ -1169,7 +1146,7 @@ components: type: integer minimum: 0 maximum: 3279165 - ssbSubCarrierSpacing: + sSBSubCarrierSpacing: $ref: '#/components/schemas/SsbSubCarrierSpacing' multiFrequencyBandListNR: type: integer @@ -1331,7 +1308,11 @@ components: nRTCI: type: integer cellIndividualOffset: - $ref: '#/components/schemas/CellIndividualOffset' + type: array + items: + $ref: '#/components/schemas/QOffsetRange' + minItems: 6 + maxItems: 6 adjacentNRCellRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' nRFreqRelationRef: @@ -1368,15 +1349,23 @@ components: type: object properties: offsetMO: - $ref: '#/components/schemas/QOffsetRangeList' + type: array + items: + $ref: '#/components/schemas/QOffsetRange' + minItems: 6 + maxItems: 6 blockListEntry: type: array items: type: integer minimum: 0 - maximum: 1007 + maximum: 503 blockListEntryIdleMode: - type: integer + type: array + items: + type: integer + minimum: 0 + maximum: 1007 cellReselectionPriority: type: integer cellReselectionSubPriority: @@ -1431,15 +1420,23 @@ components: type: object properties: cellIndividualOffset: - $ref: '#/components/schemas/CellIndividualOffset' - blackListEntry: + type: array + items: + $ref: '#/components/schemas/QOffsetRange' + minItems: 6 + maxItems: 6 + blockListEntry: + type: array + items: + type: integer + minimum: 0 + maximum: 503 + blockListEntryIdleMode: type: array items: type: integer minimum: 0 maximum: 1007 - blackListEntryIdleMode: - type: integer cellReselectionPriority: type: integer cellReselectionSubPriority: @@ -1705,6 +1702,19 @@ components: $ref: '#/components/schemas/EP_F1C-Multiple' EP_F1U: $ref: '#/components/schemas/EP_F1U-Multiple' + NRNetwork-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + NRFrequency: + $ref: '#/components/schemas/NRFrequency-Multiple' + ExternalGnbCuCpFunction: + $ref: '#/components/schemas/ExternalGnbCuCpFunction-Multiple' + ExternalGnbCuUpFunction: + $ref: '#/components/schemas/ExternalGnbCuUpFunction-Multiple' + ExternalGnbDuFunction: + $ref: '#/components/schemas/ExternalGnbDuFunction-Multiple' ExternalGnbCuUpFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1775,6 +1785,15 @@ components: nRFrequencyRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + EUtraNetwork-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + EUtranFrequency: + $ref: '#/components/schemas/EUtranFrequency-Multiple' + ExternalENBFunction: + $ref: '#/components/schemas/ExternalENBFunction-Multiple' ExternalENBFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1977,7 +1996,9 @@ components: type: object properties: coverageShapeList: - type: integer + type: array + items: + $ref: '#/components/schemas/CoverageShape' downlinkTransmitPowerRange: $ref: '#/components/schemas/ParameterRange' antennaTiltRange: @@ -1990,19 +2011,13 @@ components: $ref: '#/components/schemas/ParameterRange' CCOWeakCoverageParameters-Single: - allOf: - - $ref: '#/components/schemas/CCOParameters-Attr' - - type: object + $ref: '#/components/schemas/CCOParameters-Attr' CCOPilotPollutionParameters-Single: - allOf: - - $ref: '#/components/schemas/CCOParameters-Attr' - - type: object + $ref: '#/components/schemas/CCOParameters-Attr' CCOOvershootCoverageParameters-Single: - allOf: - - $ref: '#/components/schemas/CCOParameters-Attr' - - type: object + $ref: '#/components/schemas/CCOParameters-Attr' NTNFunction-Single: allOf: @@ -2031,6 +2046,22 @@ components: ephemerisInfos: $ref: '#/components/schemas/EphemerisInfos' + NRECMappingRule-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + ecMRInputMinimumValue: + type: integer + ecMRInputMaximumValue: + type: integer + ecTimeInterval: + type: integer + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- GnbDuFunction-Multiple: @@ -2189,6 +2220,10 @@ components: type: array items: $ref: '#/components/schemas/EphemerisInfoSet-Single' + NRECMappingRule-Multiple: + type: array + items: + $ref: '#/components/schemas/NRECMappingRule-Single' #-------- Definitions in TS 28.541 for TS 28.532 --------------------------------- @@ -2203,6 +2238,9 @@ components: - $ref: '#/components/schemas/NrCellDu-Single' - $ref: '#/components/schemas/NrOperatorCellDu-Single' + - $ref: '#/components/schemas/NRNetwork-Single' + - $ref: '#/components/schemas/EUtraNetwork-Single' + - $ref: '#/components/schemas/NRFrequency-Single' - $ref: '#/components/schemas/EUtranFrequency-Single' @@ -2253,4 +2291,5 @@ components: - $ref: '#/components/schemas/CCOOvershootCoverageParameters-Single' - $ref: '#/components/schemas/NTNFunction-Single' - $ref: '#/components/schemas/EphemerisInfoSet-Single' + - $ref: '#/components/schemas/NRECMappingRule-Single' diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 121dc8f67f4d2c3a97d27200e1c9a19d54ea757b..215139ba0b83b7dc12e24ed905b2a2df84390d33 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Slice NRM - version: 18.8.0 + version: 18.10.0 description: >- OAS 3.0.1 specification of the Slice NRM @ 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -144,6 +144,15 @@ components: $ref: '#/components/schemas/ServAttrCom' nOofPDUSessions: type: integer + MaxNumberofUEs: + type: object + properties: + servAttrCom: + $ref: '#/components/schemas/ServAttrCom' + 3GPPNoOfUEs: + type: integer + non3GPPNoOfUEs: + type: integer KPIMonitoring: type: object properties: @@ -355,7 +364,7 @@ components: type: object properties: maxNumberofUEs: - type: integer + $ref: '#/components/schemas/MaxNumberofUEs' dLLatency: type: number uLLatency: @@ -415,7 +424,9 @@ components: uLPktDelayVariation: $ref: '#/components/schemas/Float' sliceSubnetAvailability: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' + type: array + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' RANSliceSubnetProfile: type: object @@ -431,7 +442,7 @@ components: resourceSharingLevel: $ref: '#/components/schemas/SharingLevel' maxNumberofUEs: - type: integer + $ref: '#/components/schemas/MaxNumberofUEs' activityFactor: type: integer dLThptPerSliceSubnet: @@ -497,7 +508,7 @@ components: uLLatency: type: integer maxNumberofUEs: - type: integer + $ref: '#/components/schemas/MaxNumberofUEs' dLThptPerSliceSubnet: $ref: '#/components/schemas/XLThpt' dLThptPerUE: @@ -571,7 +582,9 @@ components: uLPktDelayVariation: $ref: '#/components/schemas/Float' sliceSubnetAvailability: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' + type: array + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' ServiceProfile: type: object @@ -581,7 +594,7 @@ components: plmnInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList' maxNumberofUEs: - type: number + $ref: '#/components/schemas/MaxNumberofUEs' dLLatency: type: number uLLatency: @@ -667,7 +680,9 @@ components: uLPktDelayVariation: $ref: '#/components/schemas/Float' sliceAvailability: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' + type: array + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' SliceProfile: type: object @@ -900,7 +915,7 @@ components: type: string epApplicationRefs: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - connectionPointRefList: + externalEndPointRefList: type: array items: $ref: '#/components/schemas/ConnectionPointInfo' diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index f5985b380d3b5e0fe042a76a134ec72c1e6251dc..fefc928148d042b2bbc5ccbf34773b4a128dbeb4 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Common Type Definitions - version: 18.7.0 + version: 18.11.0 description: >- OAS 3.0.1 specification of common type definitions in the Generic NRM - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.623; Generic NRM; Common type definitions @@ -106,16 +106,15 @@ components: $ref: '#/components/schemas/Longitude' altitude: $ref: '#/components/schemas/Float' - ConvexGeoPolygon: - type: array - items: - $ref: '#/components/schemas/GeoCoordinate' - minItems: 3 GeoArea: - type: object - properties: - convexGeoPolygon: - $ref: '#/components/schemas/ConvexGeoPolygon' + oneOf: + - type: object + properties: + geoPolygon: + type: array + items: + $ref: '#/components/schemas/GeoCoordinate' + minItems: 1 GeoAreaToCellMapping: type: object properties: @@ -238,6 +237,21 @@ components: description: >- The filter format shall be compliant to Jex (TS 32.161). type: string + JexConditions: + type: string + description: >- + The value of the string shall be a Jex expression that is compliant to the + Jex conditions profile specified in clause 7.6 of TS 32.161. + JexNodeSelectionBasic: + type: string + description: >- + The value of the string shall be a Jex expression that is compliant to the + Jex basic profile specified in clause 7.4 of TS 32.161. + JexNodeSelectionAdvanced: + type: string + description: >- + The value of the string shall be a Jex expression that is compliant to the + Jex advanced profile specified in clause 7.5 of TS 32.161. SystemDN: type: string @@ -289,7 +303,7 @@ components: timeTick: type: integer filter: - $ref: '#/components/schemas/Filter' + $ref: '#/components/schemas/JexConditions' ErrorResponseGet: description: >- @@ -390,7 +404,7 @@ components: type: string title: type: string - badOP: + badOp: type: string otherProblems: type: array diff --git a/OpenAPI/TS28623_FileManagementNrm.yaml b/OpenAPI/TS28623_FileManagementNrm.yaml index a0b20fe331eb04fc84b438f734814a577bbc437c..4a84bd5236b937e8707089c7139018fd437d7b25 100644 --- a/OpenAPI/TS28623_FileManagementNrm.yaml +++ b/OpenAPI/TS28623_FileManagementNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: File Management NRM - version: 18.7.0 + version: 18.9.0 description: >- OAS 3.0.1 definition of the File Management NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -19,7 +19,7 @@ components: for usage in the "FileDownloadJob". type: object properties: - jobId: + id: type: string status: type: string diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 695a96fa442dded3b0438515c7de8c8ad024ef97..c73c065f8d21f649aef457da0d2a314f81757c4b 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Generic NRM - version: 18.7.0 + version: 18.10.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 @@ -201,29 +201,13 @@ components: properties: streamTarget: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' - Scope: - oneOf: - - type: object - properties: - scopeType: - type: string - enum: - - BASE_ONLY - - BASE_ALL - - BASE_NTH_LEVEL - - BASE_SUBTREE - scopeLevel: - type: integer - - type: object - properties: - dataNodeSelector: - type: string + ProcessMonitor: description: >- This data type is the "ProcessMonitor" data type without specialisations. type: object properties: - jobId: + id: type: string status: type: string @@ -249,24 +233,55 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' timer: type: integer + AreaScope: oneOf: - type: array items: $ref: '#/components/schemas/EutraCellId' - - type: array - items: - $ref: '#/components/schemas/NrCellId' - - type: array - items: - $ref: '#/components/schemas/Tac' - - type: array - items: - $ref: '#/components/schemas/Tai' + minItems: 1 + maxItems: 32 + - type: object + properties: + nrCellId: + type: array + items: + $ref: '#/components/schemas/NrCellId' + minItems: 1 + maxItems: 32 + nPNIdentityList: + type: array + items: + $ref: '#/components/schemas/NpnId-Type' + - type: object + properties: + tacList: + type: array + items: + $ref: '#/components/schemas/Tac' + minItems: 1 + maxItems: 8 + cAGIdList: + type: array + items: + type: string + maxItems: 256 + - type: object + properties: + taiList: + type: array + items: + $ref: '#/components/schemas/Tai' + minItems: 1 + maxItems: 8 + nPNIdentityList: + type: array + items: + $ref: '#/components/schemas/NpnId-Type' - type: array items: $ref: '#/components/schemas/NpnId-Type' - + minItems: 1 Tai: type: object properties: diff --git a/OpenAPI/TS28623_PmControlNrm.yaml b/OpenAPI/TS28623_PmControlNrm.yaml index 23581d77711c1ee2a42c43c17f6ff70ea80a265c..a53978b099f3ba87b90dd56039546f6e44cf76f7 100644 --- a/OpenAPI/TS28623_PmControlNrm.yaml +++ b/OpenAPI/TS28623_PmControlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: PM control NRM - version: 18.6.0 + version: 18.9.0 description: >- OAS 3.0.1 definition of the PM control NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -49,6 +49,8 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' reportingCtrl: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ReportingCtrl' + _linkToFiles: + type: string Files: $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple' diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml index 5d493262645fbb6458f8ab4ea7730cecd0226216..479f338745c0236ce89b333fbdea2060d5beb342 100644 --- a/OpenAPI/TS28623_SubscriptionControlNrm.yaml +++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Subscription Control NRM - version: 18.7.0 + version: 18.9.0 description: >- OAS 3.0.1 definition of the Subscription Control NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -14,17 +14,24 @@ components: schemas: #-------- Definition of types----------------------------------------------------- Scope: - type: object - properties: - scopeType: - type: string - enum: - - BASE_ONLY - - BASE_ALL - - BASE_NTH_LEVEL - - BASE_SUBTREE - scopeLevel: - type: integer + oneOf: + - type: object + properties: + scopeType: + type: string + enum: + - BASE_ONLY + - BASE_ALL + - BASE_NTH_LEVEL + - BASE_SUBTREE + scopeLevel: + type: integer + - type: object + properties: + dataNodeSelector: + oneOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionBasic' + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionAdvanced' #-------- Definition of concrete IOCs -------------------------------------------- NtfSubscriptionControl-Single: @@ -44,7 +51,7 @@ components: scope: $ref: '#/components/schemas/Scope' notificationFilter: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexConditions' HeartbeatControl: $ref: '#/components/schemas/HeartbeatControl-Single' HeartbeatControl-Single: diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 0d09284e0e6357c9c2f8d90966a5e65af059ba66..55d52a1f6cd34b7eebd9d84727c73de4ae846084 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Trace Control NRM - version: 18.7.0 + version: 18.10.0 description: >- OAS 3.0.1 definition of the Trace 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,Trace Control NRM @@ -261,6 +261,8 @@ components: - N20 - N22 - N26 + - N41 + - N42 AUSFInterfaces: type: array items: @@ -297,6 +299,7 @@ components: - N5 - N7 - N15 + - N28 SMFInterfaces: type: array items: @@ -307,6 +310,10 @@ components: - N10 - N11 - S5-C + - N16 + - N16a + - N38 + - N40 SMSFInterfaces: type: array items: @@ -399,9 +406,6 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc' mnc: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc' - required: - - mcc - - mnc listOfTraceMetrics: description: The trace metrics to be reported. See 3GPP TS 32.422 clause 10 for additional details. @@ -432,10 +436,6 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc' traceId: type: string - required: - - mcc - - mnc - - traceId traceReportingFormat-Type: type: string @@ -465,13 +465,10 @@ components: - SUPI TargetIdValue: type: string - required: - - TargetIdType - - TargetIdValue triggeringEvents-Type: type: object - description: Specifies when to start a Trace Recording Session and which message shall be recorded first, when to stop a Trace Recording Session and which message shall be recorded last respectively. See 3GPP TS 32.422 clause 5.1 for additional detials. + description: Specifies when to start a Trace Recording Session and which message shall be recorded first, when to stop a Trace Recording Session and which message shall be recorded last respectively. See 3GPP TS 32.422 clause 5.1 for additional details. properties: MSC_SERVER: type: array @@ -556,6 +553,7 @@ components: - NetworkDeregistration - UEMobilityFromEPC - UEMobilityToEPC + - ConvergedChargingService SMF: type: array items: @@ -567,6 +565,9 @@ components: - PDUsessionUPactivationDeactivation - MobilityBtw3gppAndN3gppTo5GC - MobilityFromEpc + - MobilityBtwISMForVSMF + - ConvergedChargingService + - OfflineOnlyCharging PCF: type: array items: @@ -576,6 +577,7 @@ components: - SMpolicy - Authorization - BDTpolicy + - SpendingLimitControl UPF: type: array items: @@ -639,7 +641,7 @@ components: description: Determines whether beam level measurements shall be included in case of immediate MDT M1 measurement in NR. For additional details see 3GPP TS 32.422 clause 5.10.40. type: boolean - collectionPeriodRrmLte-Type: + collectionPeriodRRMLTE-Type: description: See details in 3GPP TS 32.422 clause 5.10.20. type: string enum: @@ -654,7 +656,7 @@ components: - 10240ms - 60000ms - collectionPeriodM6Lte-Type: + collectionPeriodM6LTE-Type: description: See details in 3GPP TS 32.422 clause 5.10.32. type: string enum: @@ -663,13 +665,13 @@ components: - 5120ms - 10240ms - collectionPeriodM7Lte-Type: + collectionPeriodM7LTE-Type: description: See details in 3GPP TS 32.422 clause 5.10.33. type: integer minimum: 1 maximum: 60 - collectionPeriodRrmUmts-Type: + collectionPeriodRRMUMTS-Type: description: See details in 3GPP TS 32.422 clause 5.10.21. type: string enum: @@ -682,7 +684,7 @@ components: - 4000ms - 6000ms - collectionPeriodRrmNr-Type: + collectionPeriodRRMNR-Type: description: See details in 3GPP TS 32.422 clause 5.10.30. type: string enum: @@ -692,7 +694,7 @@ components: - 10240ms - 60000ms - collectionPeriodM6Nr-Type: + collectionPeriodM6NR-Type: description: See details in 3GPP TS 32.422 clause 5.10.34. type: string enum: @@ -711,7 +713,7 @@ components: - 12min - 30min - collectionPeriodM7Nr-Type: + collectionPeriodM7NR-Type: description: See details in 3GPP TS 32.422 clause 5.10.35. type: integer minimum: 1 @@ -725,7 +727,7 @@ components: - A2_EVENT eventThreshold-Type: - description: See details in 3GPP TS 32.422 clause 5.10.7, 5.10.7a, 5.10.13 and 5.10.14. + description: See details in 3GPP TS 32.422 clause 5.10.7 (LTE/NR Event A2 RSRP, RSRQ, SINR), 5.10.13 (UMTS Event 1f) and 5.10.14 (UMTS Event 1i). type: object properties: EventThresholdRSRP: @@ -744,6 +746,10 @@ components: - type: integer minimum: 0 maximum: 127 + EventThresholdSINR: + type: integer + minimum: 0 + maximum: 127 EventThreshold1F: type: object properties: @@ -802,13 +808,16 @@ components: items: type: string enum: - - M1 - - M2 - - M3 - - M4 - - M5 - - M6 - - M7 + - M1_DL + - M2_DL + - M4_DL + - M4_UL + - M5_DL + - M5_UL + - M6_DL + - M6_UL + - M7_DL + - M7_UL - M1_EVENT_TRIGGERED - M8 - M9 @@ -872,7 +881,7 @@ components: - INFINITY eventThresholdL1-Type: - description: See details in 3GPP TS 32.422 clause 5.10.X. + description: See details in 3GPP TS 32.422 clause 5.10.36. type: object properties: RSRP: @@ -885,13 +894,13 @@ components: maximum: 127 hysteresisL1-Type: - description: See details in 3GPP TS 32.422 clause 5.10.Y. + description: See details in 3GPP TS 32.422 clause 5.10.37. type: integer minimum: 0 maximum: 30 timeToTriggerL1-Type: - description: See details in 3GPP TS 32.422 clause 5.10.Z. + description: See details in 3GPP TS 32.422 clause 5.10.38. type: string enum: - 0ms @@ -911,7 +920,7 @@ components: - 2560ms - 5120ms - measurementPeriodLte-Type: + measurementPeriodLTE-Type: description: See details in 3GPP TS 32.422 clause 5.10.23. type: string enum: @@ -921,7 +930,7 @@ components: - 10240ms - 1min - measurementPeriodUmts-Type: + measurementPeriodUMTS-Type: description: See details in 3GPP TS 32.422 clause 5.10.22. type: string enum: @@ -947,8 +956,8 @@ components: - CPICH_RSCP - PathLoss - eventThresholdUphUmts-Type: - description: See details in 3GPP TS 32.422 clause 5.10.A. + eventThresholdUphUMTS-Type: + description: See details in 3GPP TS 32.422 clause 5.10.39. type: integer minimum: 0 maximum: 31 @@ -963,9 +972,6 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc' mnc: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc' - required: - - mcc - - mnc maxItems: 16 positioningMethod-Type: @@ -1299,26 +1305,26 @@ components: $ref: '#/components/schemas/reportInterval-Type' eventThreshold: $ref: '#/components/schemas/eventThreshold-Type' - collectionPeriodRrmLte: - $ref: '#/components/schemas/collectionPeriodRrmLte-Type' - collectionPeriodM6Lte: - $ref: '#/components/schemas/collectionPeriodM6Lte-Type' - collectionPeriodM7Lte: - $ref: '#/components/schemas/collectionPeriodM7Lte-Type' - collectionPeriodRrmUmts: - $ref: '#/components/schemas/collectionPeriodRrmUmts-Type' - collectionPeriodRrmNr: - $ref: '#/components/schemas/collectionPeriodRrmNr-Type' - collectionPeriodM6Nr: - $ref: '#/components/schemas/collectionPeriodM6Nr-Type' - collectionPeriodM7Nr: - $ref: '#/components/schemas/collectionPeriodM7Nr-Type' - eventThresholdUphUmts: - $ref: '#/components/schemas/eventThresholdUphUmts-Type' - measurementPeriodUmts: - $ref: '#/components/schemas/measurementPeriodUmts-Type' - measurementPeriodLte: - $ref: '#/components/schemas/measurementPeriodLte-Type' + collectionPeriodRRMLTE: + $ref: '#/components/schemas/collectionPeriodRRMLTE-Type' + collectionPeriodM6LTE: + $ref: '#/components/schemas/collectionPeriodM6LTE-Type' + collectionPeriodM7LTE: + $ref: '#/components/schemas/collectionPeriodM7LTE-Type' + collectionPeriodRRMUMTS: + $ref: '#/components/schemas/collectionPeriodRRMUMTS-Type' + collectionPeriodRRMNR: + $ref: '#/components/schemas/collectionPeriodRRMNR-Type' + collectionPeriodM6NR: + $ref: '#/components/schemas/collectionPeriodM6NR-Type' + collectionPeriodM7NR: + $ref: '#/components/schemas/collectionPeriodM7NR-Type' + eventThresholdUphUMTS: + $ref: '#/components/schemas/eventThresholdUphUMTS-Type' + measurementPeriodUMTS: + $ref: '#/components/schemas/measurementPeriodUMTS-Type' + measurementPeriodLTE: + $ref: '#/components/schemas/measurementPeriodLTE-Type' measurementQuantity: $ref: '#/components/schemas/measurementQuantity-Type' beamLevelMeasurement: @@ -1348,14 +1354,16 @@ components: type: array items: $ref: '#/components/schemas/MbsfnArea' + maxItems: 8 reportType: $ref: '#/components/schemas/reportType-Type' - plmnList: - $ref: '#/components/schemas/plmnList-Type' eventListForEventTriggeredMeasurement: $ref: '#/components/schemas/eventListForEventTriggeredMeasurement-Type' areaConfigurationForNeighCell: - $ref: '#/components/schemas/AreaConfig' + type: array + items: + $ref: '#/components/schemas/AreaConfig' + maxItems: 32 nPNIdentityList: type: array items: @@ -1370,20 +1378,24 @@ components: areaScope: type: array items: - $ref: '#/components/schemas/AreaScope' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/AreaScope' sensorInformation: $ref: '#/components/schemas/sensorInformation-Type' immediateMDTConfig: $ref: '#/components/schemas/immediateMDTConfig-Type' loggedMDTConfig: $ref: '#/components/schemas/loggedMDTConfig-Type' + plmnList: + $ref: '#/components/schemas/plmnList-Type' UECoreMeasConfig-Type: description: UE level measurements configuration parameters for 5G system. See details in 3GPP TS 28.622 clause 4.3.x. type: object properties: ueCoreMeasurements: - type: string + type: array + items: + type: string ueCoreMeasGranularityPeriod: type: integer nfTypeToMeasure: @@ -1393,23 +1405,6 @@ components: rootObjectInstances: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - AreaScope: - oneOf: - - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/EutraCellId' - - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NrCellId' - - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Tac' - - type: array - items: - $ref: '#/components/schemas/Tai' - - type: array - items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type' Tai: type: object properties: @@ -1460,6 +1455,8 @@ components: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type' listOfTraceMetrics: type: array + items: + type: string traceReportingConsumerUri: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' traceCollectionEntityIpAddress: diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang index 08b8fc7211dd4b505c121951bbdd93d1e606a462..e78863dec45599ec60d1b8e0a229632a422f33cd 100755 --- a/yang-models/_3gpp-5g-common-yang-types.yang +++ b/yang-models/_3gpp-5g-common-yang-types.yang @@ -3,18 +3,19 @@ module _3gpp-5g-common-yang-types { namespace "urn:3gpp:sa5:_3gpp-5g-common-yang-types"; prefix "types5g3gpp"; - - import ietf-yang-types { prefix yang; } + import _3gpp-common-yang-types { prefix types3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "The model defines common types for 5G networks and network slicing. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-08-18 { reference CR-1557; } + revision 2024-10-06 { reference CR-1389; } revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-05-10 { reference CR-0916; } @@ -22,6 +23,46 @@ module _3gpp-5g-common-yang-types { revision 2020-11-05 { reference CR-0412 ; } revision 2019-10-20 { reference "Initial version."; } + grouping NcgiGrp { + description "Represents the Ncgi datatype"; + + list plmnId { + description "This attribute represents a PLMN Identity."; + min-elements 1; + max-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses types3gpp:PLMNId ; + } + + leaf nrCellId { + type string; + mandatory true; + description "This attribute represents NR Cell Identity. + It's a 36-bit string identifying an NR Cell Id as specified in + clause 9.3.1.7 of TS 38.413, in hexadecimal representation. Each + character in the string shall take a value of + '0' to '9', 'a' to 'f' or 'A' to 'F' and shall represent 4 bits. + The most significant character representing the 4 most significant + bits of the Cell Id shall appear first in the string, and the + character representing the 4 least significant bit of the + Cell Id shall appear last in the string. + + Pattern: '^[A-Fa-f0-9]{9}$' + + Example: + An NR Cell Id 0x225BD6007 shall be encoded as '225BD6007'."; + } + + leaf nId { + type string; + mandatory true; + description "Network Identity; Shall be present if PlmnIdNid identifies + an SNPN (see clauses 5.30.2.3, 5.30.2.9, 6.3.4, and 6.3.8 in + 3GPP TS 23.501."; + } + } + typedef NRTAC { type string; description "This holds the identity of the common Tracking Area Code @@ -36,27 +77,6 @@ module _3gpp-5g-common-yang-types { d) For a 5G SA (Stand Alone), it has a non-null value."; } - grouping SNssai { - description - "Single Network Slice Selection Assistance Information(S-NSSAI)"; - reference "3GPP TS 23.003"; - - leaf sd { - description "Slice Differentiator - If not needed, the value can be set to ff:ff:ff."; - type yang:hex-string { - length 8; - } - reference "3GPP TS 23.003"; - } - - leaf sst { - type uint8; - description "Slice/Service Type. - Values 0 to 127 belong to standardized SST range and are defined in - 3GPP TS 23.501. Values 128 to 255 belong to operator-specific range."; - } - } grouping PlmnIdNid { description "Represents the SCP domain specific information as defined @@ -80,7 +100,7 @@ module _3gpp-5g-common-yang-types { comprised of an SST (Slice/Service type) and an optional SD (Slice Differentiator) field"; uses types3gpp:PLMNId; - uses SNssai; + uses types3gpp:SNssai; } typedef CommModelType { diff --git a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang index b649d0bb05624c621681a5cba540ca8c095ce24a..a4ce535e2d90053a63e603a31217489aace20d48 100755 --- a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang @@ -5,18 +5,19 @@ module _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl { prefix gtpUPathQMCtrl3gpp; import _3gpp-common-managed-element { prefix me3gpp; } - import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-5gc-nrm-smffunction { prefix smf3gpp; } import _3gpp-common-top { prefix top3gpp; } + import _3gpp-common-yang-types { prefix types3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the capabilities and properties for control of GTP-U path QoS monitoring defined in 3GPP TS 23.501. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-08-18 { reference CR-1557 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2020-11-05 { reference CR-0412 ; } revision 2020-09-30 { reference "CR-0393"; } @@ -70,7 +71,7 @@ module _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl { description "The S-NSSAIs for which the the GTP-U path QoS monitoring is to be performed."; reference "3GPP TS 23.003"; - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } leaf-list monitoredDSCPs { @@ -126,7 +127,7 @@ module _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl { delay for GTP-U path QoS monitoring."; type uint32; } - } + } augment "/me3gpp:ManagedElement/smf3gpp:SMFFunction" { diff --git a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang index 3294c01f8880fc588072fdcd1a087ee2872d514a..9985b8e1cf61431620ee26d46e301b80e836f91a 100755 --- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang @@ -7,8 +7,7 @@ module _3gpp-5gc-nrm-QFQoSMonitoringControl { import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-5gc-nrm-smffunction { prefix smf3gpp; } import _3gpp-common-top { prefix top3gpp; } - import _3gpp-5g-common-yang-types { prefix types5g3gpp; } - + import _3gpp-common-yang-types { prefix types3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the capabilities and properties for control @@ -19,8 +18,8 @@ in 3GPP TS 23.501. TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - revision 2023-09-18 { reference CR-1043 ; } - revision 2023-04-26 { reference CR-0916; } + revision 2025-08-18 { reference CR-1557 ; } + revision 2023-09-24 { reference CR-0916; } revision 2020-11-08 { reference CR-0412 ; } revision 2020-08-03 { reference "CR-0321"; } revision 2020-04-10 { reference "S5-202101"; } @@ -64,7 +63,7 @@ in 3GPP TS 23.501. per UE is to be performed."; reference "3GPP TS 23.003"; key "sd sst"; - uses types5g3gpp:SNssai;} + uses types3gpp:SNssai;} leaf-list qFMonitored5QIs { description "The 5QIs for which the QoS monitoring per QoS flow @@ -122,7 +121,25 @@ in 3GPP TS 23.501. packet delay for QoS monitoring per QoS flow per UE."; type uint32; } + + list qFMonitoredSatelliteBackhaulCategories { + description "The satellite backhaul categories for which the QoS + monitoring per QoS flow per UE is to be performed."; + key satellitebackhaulcat; + + leaf satellitebackhaulcat{ + description "Specifies the satellite backhaul."; + reference "3GPP TS 23.501"; + type enumeration { + enum DYNAMIC_GEO; + enum DYNAMIC_MEO; + enum DYNAMIC_LEO; + enum DYNAMIC_OTHER_SAT; + } + } + } } + augment "/me3gpp:ManagedElement/smf3gpp:SMFFunction" { diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index 310e71835b97e066a22d95ba86e9e3f2b67a90be..6198cdf64608544390a1cb993a1b55e8167b43b7 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -8,25 +8,31 @@ module _3gpp-5gc-nrm-amffunction { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import ietf-inet-types { prefix inet; } + import ietf-yang-types { prefix yang; } import _3gpp-common-top { prefix top3gpp; } + import _3gpp-nr-nrm-gnbcuupfunction { prefix gnbcuup3gpp; } + import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; } + import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "AMFFunction derived from basic ManagedFunction. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-11-06 { reference CR-1639 ; } + revision 2025-08-18 { reference CR-1557 ; } + revision 2024-10-06 { reference CR-1389; } revision 2024-04-04 { reference CR-1139; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-01-07 { reference CR-0643; } revision 2020-11-06 { reference CR-0412 ; } revision 2019-10-25 { reference "S5-194457 S5-193518"; } - revision 2019-05-31 { reference "Ericsson refactoring."; } revision 2018-08-07 { reference "Initial revision"; } - - grouping GlobalRanNodeIDGrp{ + + grouping NTNGlobalRanNodeIDGrp{ list pLMNId { description "The PLMN Identifier is composed of @@ -116,14 +122,13 @@ module _3gpp-5gc-nrm-amffunction { } } - grouping satelliteBackhaulInfo{ + grouping SatelliteBackhaulInfoGrp{ description "Defines information related to satellite backhaul category and corresponding information of gNB."; reference "3GPP TS 23.501"; - list GlobalRanNodeID{ + list nTNGlobalRanNodeID{ description "Unique identifier of an NG-RAN node."; - uses GlobalRanNodeIDGrp; min-elements 1; max-elements 1; leaf GlobalRanNodeIDValue{ @@ -131,6 +136,7 @@ module _3gpp-5gc-nrm-amffunction { description "this relies on the choice of GlobalRanNodeID"; } key "GlobalRanNodeIDValue"; + uses NTNGlobalRanNodeIDGrp; } leaf satelliteBackhaulCategory{ @@ -160,20 +166,309 @@ module _3gpp-5gc-nrm-amffunction { } } + grouping GUAMInfoGrp { + description "Represents the GUAMInfo datatype."; + + list pLMNId { + description "This attribute represents a PLMN Identity."; + min-elements 1; + max-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses types3gpp:PLMNId ; + } + + leaf aMFIdentifier { + type int64; + description "The AMFI is constructed from an AMF Region ID, an + AMF Set ID and an AMF Pointer. The AMF Region ID identifies the region, + the AMF Set ID uniquely identifies the AMF Set within the AMF Region, + and the AMF Pointer uniquely identifies the AMF within the AMF Set. + (Ref. 3GPP TS 23.003)"; + } + } + + grouping N2InterfaceAmfInfoGrp { + description "Represents the N2InterfaceAmfInfo datatype."; + + leaf-list ipv4EndpointAddress { + type inet:ipv4-address; + min-elements 1; + description "This attribute represents available AMF endpoint + IPv4 address(es) for N2."; + } + + leaf-list ipv6EndpointAddress { + type inet:ipv6-address; + min-elements 1; + description "This attribute represents available AMF endpoint + IPv6 address(es) for N2."; + } + + leaf amfName { + type inet:host-name; + description "This attribute represents AMF Name FQDN as defined in + clause 28.3.2.5 of TS 23.003."; + } + } + + grouping BlockedLocationInfoGrp { + description "Repreasents the datatype BlockedLocationInfo"; + + list blockedLocation { + description "This provides the geographical location at which the PLMN + are not allowed in case of NTN."; + min-elements 1; + max-elements 1; + key "mnc mcc"; + uses types3gpp:PLMNId ; + } + + list blockedDurWindow { + description "This provides the time durations for which the PLMN are + not allowed at a given location in case of NTN"; + key idx; + leaf idx { type uint32 ; } + uses types3gpp:TimeWindowGrp; + } + + list blockedSlice { + description "This provides the slice for which the access is + not allowed at a given location in case of NTN. "; + max-elements 1; + key idx; + unique "sst sd"; + leaf idx { type uint32; } + uses types3gpp:SNssai; + } + } + + grouping NTNPLMNRestrictionsInfoGrp { + description "Represents the datatype NTNPLMNRestrictionsInfo"; + + list pLMNId { + description "This attribute represents a PLMN Identity."; + min-elements 1; + max-elements 1; + key "mnc mcc"; + uses types3gpp:PLMNId ; + } + + list blockedLocationInfoList { + description "This defines the information related with the location + for which the access restrictions are to be applied in case of NTN."; + key "idx"; + leaf idx { type uint32 ; } + uses BlockedLocationInfoGrp; + } + } + + grouping NtnLocationInfoGrp { + description "Represents the NtnLocationInfo datatype."; + + list location { + description "This defines the Location (geographical area) under + consideration to which the satellite coverage info belongs"; + key idx; + leaf idx { type uint32 ; } + uses types3gpp:GeoAreaGrp; + } + + list availabilityWindows { + description "This attribute defines the list of time windows at which + the satellite coverage will be available for this location. + Either availabilityWindows or nonAvailabilityWindows shall be present."; + key idx; + leaf idx { type uint32 ; } + uses types3gpp:TimeWindowGrp; + } + + list nonAvailabilityWindows { + description "This attribute defines the list of time windows at which + the satellite coverage will not be available for this location. + Either availabilityWindows or nonAvailabilityWindows shall be present."; + key idx; + leaf idx { type uint32 ; } + uses types3gpp:TimeWindowGrp; + } + } + + grouping SatelliteCoverageInfoGrp { + description "Represents the datatype SatelliteCoverageInfo"; + + leaf nRSatelliteRATtype { + type enumeration { + enum NRLEO; + enum NRMEO; + enum NRGEO; + enum NROTHERSAT; + } + description "This attribute defines the RAT Type for NR satellite + access."; + } + + list locationInfo { + description "This attribute defines the information about location and + corresponding time windows for which the satellite coverage will be + available or unavailable."; + key idx; + leaf idx { type uint32 ; } + uses NtnLocationInfoGrp; + } + } + + grouping SliceExpiryInfoGrp { + description "Represents the datatype SliceExpiryInfo"; + + list pLMNInfo { + min-elements 1; // ??? + config false; + description "It defines the PLMN(s) of a Network Function. "; + key idx; + leaf idx { type uint32 ; } + uses types5g3gpp:PLMNInfo; + } + + leaf expiryTime { + type yang:date-and-time; + config false; + description "This attribute provides information about the time at + which the slice is scheduled to be expired as it is not required + anymore. + This attribute will be set based on the sliceAvailability coming as + part of ServiceProfile."; + } + } + + grouping MappedCellIdInfoGrp { + description "Represents the datatype MappedCellIdInfo"; + + list ntnGeoArea { + description "This attribute indicates a specific geographical location + mapped to Mapped Cell ID(s)."; + min-elements 1; + max-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses types3gpp:GeoAreaGrp; + } + + list mappedCellId { + description "This attribute is in format of NCGI to indicate a fixed + geographical area (See subclause 16.14.5 in TS 38.300"; + min-elements 1; + max-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses types5g3gpp:NcgiGrp; + } + } + + grouping AmfInfoGrp { + description "Represents the data type AmfInfo."; + + leaf amfRegionId { + type int64; + mandatory true; + description "It represents the AMF Region ID, which identifies the + region. AllowedValues: defined in subclause 2.10.1 of 3GPP TS 23.003 "; + } + + leaf amfSetId { + type int64; + mandatory true; + description "It represents the AMF Set ID, which is uniquely identifies + the AMF Set within the AMF Region. + allowedValues: defined in subclause 2.10.1 of 3GPP TS 23.003"; + } + + list taiList { + min-elements 1; + description "The list of TAIs."; + key "idx"; + leaf idx { type uint32 ; } + uses gnbcuup3gpp:TAIGrp; + } + + list taiRangeList { + min-elements 1; + description "The range of TAIs."; + key "idx"; + leaf idx { type uint32 ; } + uses nfp3gpp:TaiRangeGrp; + } + + list gUAMIdList { + description "List of supported Globally Unique AMF Ids (GUAMIs)."; + config false; + min-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses GUAMInfoGrp; + } + + list backupInfoAmfFailure { + description "List of GUAMIs for which the AMF acts as a backup for AMF + failure."; + min-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses GUAMInfoGrp; + } + + list backupInfoAmfRemoval { + description "List of GUAMIs for which the AMF acts as a backup for + planned AMF removal."; + min-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses GUAMInfoGrp; + } + + list n2InterfaceAmfInfo { + description "This attribute represents the N2 interface information of + the AMF. "; + max-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses N2InterfaceAmfInfoGrp; + } + + leaf amfOnboardingCapability { + type boolean; + default false; + description "This attribute indicates the AMF supports SNPN Onboarding + capability. This is used for the case of Onboarding of UEs for SNPNs + (see TS 23.501, clause 5.30.2.10). + - FALSE: AMF does not support SNPN Onboarding; + - TRUE: AMF supports SNPN Onboarding."; + } + + leaf highLatencyCom { + type boolean; + description "This attribute indicates whether the AMF supports High + Latency communication (e.g. for NR RedCap UE). This is used for CP NF + to discover AMF supporting High Latency communication (see TS 23.501, + clause 6.3.5). + - FALSE: AMF does not support High Latency communication e.g. for + NR RedCap UE; + - TRUE: AMF supports High Latency communication e.g. for NR RedCap UE;"; + } + } + grouping AMFFunctionGrp { description "Represents the AMFFunction IOC"; uses mf3gpp:ManagedFunctionGrp; - list pLMNIdList { + list pLMNInfoList { min-elements 1; - description "A list of PLMN identifiers (Mobile Country Code and Mobile - Network Code)."; - key "mcc mnc"; - uses types3gpp:PLMNId; + description "It defines the PLMN(s) of a Network Function. "; + key idx; + leaf idx { type uint32 ; } + uses types5g3gpp:PLMNInfo; } container aMFIdentifier { - //presence true; description "An AMF identifier, comprising an AMF Region ID, an AMF Set ID and an AMF Pointer."; uses types3gpp:AmfIdentifier; @@ -185,23 +480,25 @@ module _3gpp-5gc-nrm-amffunction { type inet:domain-name; } - list sNSSAIList { - min-elements 1; - description "List of S-NSSAIs the managed object is capable of supporting. - (Single Network Slice Selection Assistance Information) - An S-NSSAI has an SST (Slice/Service type) and an optional SD - (Slice Differentiator) field."; - reference "3GPP TS 23.003"; - key "sd sst"; - uses types5g3gpp:SNssai; + leaf-list cNSIIdList { + type string; + description "It is a set of NSI ID. NSI ID is an identifier for + identifying the Core Network part of a Network Slice instance when + multiple Network Slice instances of the same Network Slice are deployed, + and there is a need to differentiate between them in the 5GC. + See NSI ID definition in clause 3.1 of TS 23.501 and + subclause 6.1.6.2.7 of TS 29.531"; } list managedNFProfile { key idx; + leaf idx { type uint32; } min-elements 1; max-elements 1; - uses types3gpp:ManagedNFProfile; - description ""; + description "This data type represents a Profile definition of a + Managed NF "; + reference "See TS 23.501"; + uses mnfp3gpp:ManagedNFProfileGrp; } list commModelList { @@ -213,6 +510,39 @@ module _3gpp-5gc-nrm-amffunction { uses types5g3gpp:CommModel; } + list amfInfo { + max-elements 1; + description "This attribute represents information of an AMF + NF Instance."; + key "idx"; + leaf idx { type uint32 ; } + uses AmfInfoGrp; + } + + list nTNPLMNRestrictionsList { + description "This attribute defines the location restrictions per PLMN + that relates to non-terrestrial network access."; + key "idx"; + leaf idx { type uint32 ; } + uses NTNPLMNRestrictionsInfoGrp; + } + + list satelliteCoverageInfoList { + description "This attribute defines the information related to NR + Satellite RAT type and corresponding information of satellite coverage"; + key "idx"; + leaf idx { type uint32 ; } + uses SatelliteCoverageInfoGrp; + } + + list sliceExpiryInfo { + description "This provides information related to a network slice + validity."; + key "idx"; + leaf idx { type uint32 ; } + uses SliceExpiryInfoGrp; + } + list satelliteBackhaulInfoList{ description "Specifies a list of satellite backhaul information. It can be used by NF and NF services."; @@ -222,7 +552,7 @@ module _3gpp-5gc-nrm-amffunction { } key "GlobalRanNodeIDValue"; min-elements 1; - uses satelliteBackhaulInfo; + uses SatelliteBackhaulInfoGrp; } leaf-list mdtUserConsentReqList { @@ -243,12 +573,30 @@ module _3gpp-5gc-nrm-amffunction { Any MDT measurement, whose name is not specified in this list, is not subject to user consent at MDT activation."; } + + list mappedCellIdInfoList { + description "It provides the list of mapping between GEO area and + Mapped Cell ID."; + key "idx"; + leaf idx { type uint32 ; } + uses MappedCellIdInfoGrp; + } + + leaf aMFSetRef { + type types3gpp:DistinguishedName; + description "This is the DN of AMFSet"; + } } augment "/me3gpp:ManagedElement" { list AMFFunction { - description "5G Core AMF Function"; - reference "3GPP TS 28.541"; + description "This IOC represents the AMF functionality in 5GC. + For more information about the AMF, see 3GPP TS 23.501. + + The attribute sliceExpiryInfo is used when the validity information of + a network slice need to be configured. The attribute + sliceExpiryInfo.pLMNInfo indicates the network slice to which the + validity information applies."; key id; uses top3gpp:Top_Grp; container attributes { diff --git a/yang-models/_3gpp-5gc-nrm-amfregion.yang b/yang-models/_3gpp-5gc-nrm-amfregion.yang index f44940dac5113e4e07c949c76da0e2164d07c2a0..f1b85d44d7db295ddcb7cab59e45f645f0450957 100755 --- a/yang-models/_3gpp-5gc-nrm-amfregion.yang +++ b/yang-models/_3gpp-5gc-nrm-amfregion.yang @@ -13,10 +13,11 @@ module _3gpp-5gc-nrm-amfregion { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the AMF Region which consists one or multiple AMF Sets. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-08-18 { reference CR-1557 ; } revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-01-07 { reference CR-0643; } @@ -57,7 +58,7 @@ module _3gpp-5gc-nrm-amfregion { //conditional support only if the network slicing feature is supported. reference "3GPP TS 23.003"; key "sd sst"; - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } leaf aMFRegionId { diff --git a/yang-models/_3gpp-5gc-nrm-amfset.yang b/yang-models/_3gpp-5gc-nrm-amfset.yang index 9473afee3fec86eabc21c7af67455943287243a5..e9a16136f65af5f5eb288034f50682a1b0bedcd2 100755 --- a/yang-models/_3gpp-5gc-nrm-amfset.yang +++ b/yang-models/_3gpp-5gc-nrm-amfset.yang @@ -17,6 +17,7 @@ module _3gpp-5gc-nrm-amfset { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-08-18 { reference CR-1557 ; } revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-01-07 { reference CR-0643; } @@ -56,7 +57,7 @@ module _3gpp-5gc-nrm-amfset { //conditional support only if the network slicing feature is supported. reference "3GPP TS 23.003"; key "sd sst"; - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } leaf aMFRegion { diff --git a/yang-models/_3gpp-5gc-nrm-anlffunction.yang b/yang-models/_3gpp-5gc-nrm-anlffunction.yang index 85673a4c7815f90dfe0f892352e1ee94b186ea80..c516a54c2b238963f9c3fdb38b9381454113599a 100644 --- a/yang-models/_3gpp-5gc-nrm-anlffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-anlffunction.yang @@ -6,17 +6,19 @@ module _3gpp-5gc-nrm-anlffunction { import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-top { prefix top3gpp; } - import _3gpp-5gc-nrm-nwdaffunction { prefix nwdaf3gpp; } + import _3gpp-5gc-nrm-nwdaffunction { prefix nwdaf3gpp;} + import _3gpp-common-yang-types { prefix types3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the AnLF function in 5GC. For more information about the AnLF, see 3GPP TS 23.288. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - - revision 2023-11-03 { reference "initial revision"; } + + revision 2024-08-06 { reference CR-1332; } + grouping AnLFFunctionGrp { description "Represents the AnLFFunction IOC"; @@ -29,6 +31,19 @@ module _3gpp-5gc-nrm-anlffunction { config false; description "It indicates the activation status of the AnLF"; } + leaf-list mLModelRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of MLModel ¨ + (See TS 28.105)."; + config false; + } + leaf-list aIMLInferenceFunctionRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of AIMLInferenceFunction + (See TS 28.105)."; + config false; + } + } augment "/me3gpp:ManagedElement/nwdaf3gpp:NWDAFFunction" { diff --git a/yang-models/_3gpp-5gc-nrm-ausffunction.yang b/yang-models/_3gpp-5gc-nrm-ausffunction.yang index e2648cdd32b6756ac33f9c663aa25980485acfba..f14c95befaa0238a0dfbf5e0570d7274c2624a88 100755 --- a/yang-models/_3gpp-5gc-nrm-ausffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-ausffunction.yang @@ -8,19 +8,20 @@ module _3gpp-5gc-nrm-ausffunction { import _3gpp-common-managed-element { prefix me3gpp; } import ietf-inet-types { prefix inet; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } - import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; } + import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the AUSF function in 5GC. For more information about the AUSF, see 3GPP TS 23.501. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-11-06 { reference CR-1639 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-01-07 { reference CR-0643; } revision 2020-11-06 { reference CR-0412 ; } @@ -116,9 +117,13 @@ module _3gpp-5gc-nrm-ausffunction { list managedNFProfile { key idx; + leaf idx { type uint32; } min-elements 1; max-elements 1; - uses types3gpp:ManagedNFProfile; + description "This data type represents a Profile definition of a + Managed NF "; + reference "See TS 23.501"; + uses mnfp3gpp:ManagedNFProfileGrp; } list commModelList { diff --git a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang index 12ef3c65c0b5df765fc99f83a62d6c1ab9f2cc3f..0f2d0222b06b25e884aebc0aa907576bd4f683bf 100755 --- a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang @@ -6,16 +6,20 @@ module _3gpp-5gc-nrm-dynamic5qiset { import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbdufunction { prefix gnbdu3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } + import _3gpp-nr-nrm-gnbcuupfunction { prefix gnbcuup3gpp; } import _3gpp-5gc-nrm-configurable5qiset { prefix Conf5QIs3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the dynamic 5QIs including their QoS characteristics. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-03-24 { reference CR-1488 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-07-28 { reference "CR-0770"; } revision 2022-01-07 { reference CR-0643; } @@ -52,11 +56,43 @@ module _3gpp-5gc-nrm-dynamic5qiset { } } + feature Dynamic5QISetUnderSubNetwork { + description "Dynamic5QISet shall be contained under SubNetwork."; + } augment "/subnet3gpp:SubNetwork" { + if-feature Dynamic5QISetUnderSubNetwork; uses Dynamic5QISetSubtree; } + feature Dynamic5QISetUnderManagedElement { + description "Dynamic5QISet shall be contained under ManagedElement."; + } augment "/me3gpp:ManagedElement" { + if-feature Dynamic5QISetUnderManagedElement; + uses Dynamic5QISetSubtree; + } + + feature Dynamic5QISetUnderGNBDUFunction { + description "Dynamic5QISet shall be contained under GNBDUFunction."; + } + augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" { + if-feature Dynamic5QISetUnderGNBDUFunction; + uses Dynamic5QISetSubtree; + } + + feature Dynamic5QISetUnderGNBCUCPFunction { + description "Dynamic5QISet shall be contained under GNBCUCPFunction."; + } + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction" { + if-feature Dynamic5QISetUnderGNBCUCPFunction; + uses Dynamic5QISetSubtree; + } + + feature Dynamic5QISetUnderGNBCUUPFunction { + description "Dynamic5QISet shall be contained under GNBCUUPFunction."; + } + augment "/me3gpp:ManagedElement/gnbcuup3gpp:GNBCUUPFunction" { + if-feature Dynamic5QISetUnderGNBCUUPFunction; uses Dynamic5QISetSubtree; } } \ No newline at end of file diff --git a/yang-models/_3gpp-5gc-nrm-lmffunction.yang b/yang-models/_3gpp-5gc-nrm-lmffunction.yang index 6069ae5133d295ea5ef9e24c50bcb2acf088d83c..e40f61929a8f18ef650c7bf08e6356094349402b 100755 --- a/yang-models/_3gpp-5gc-nrm-lmffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-lmffunction.yang @@ -9,13 +9,15 @@ module _3gpp-5gc-nrm-lmffunction { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-common-top { prefix top3gpp; } + import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; } organization "3gpp SA5"; description "This IOC represents the LMF function defined in 3GPP TS 23.501. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-11-06 { reference CR-1639 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-25 { reference "S5-194457 S5193518"; } @@ -29,9 +31,9 @@ module _3gpp-5gc-nrm-lmffunction { uses mf3gpp:ManagedFunctionGrp; list pLMNIdList { - description "List of at most six entries of PLMN Identifiers, but at least one (the primary PLMN Id). - The PLMN Identifier is composed of a Mobile Country Code (MCC) and a Mobile Network Code (MNC)."; - + description "List of at most six entries of PLMN Identifiers, but at + least one (the primary PLMN Id). The PLMN Identifier is composed of + a Mobile Country Code (MCC) and a Mobile Network Code (MNC)."; min-elements 1; max-elements 6; key "mcc mnc"; @@ -40,8 +42,12 @@ module _3gpp-5gc-nrm-lmffunction { list managedNFProfile { key idx; + leaf idx { type uint32; } min-elements 1; - uses types3gpp:ManagedNFProfile; + description "This data type represents a Profile definition of a + Managed NF "; + reference "See TS 23.501"; + uses mnfp3gpp:ManagedNFProfileGrp; } list commModelList { diff --git a/yang-models/_3gpp-5gc-nrm-managed-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-managed-nfprofile.yang new file mode 100644 index 0000000000000000000000000000000000000000..a11cfc27096640d18bb7c140ec6660fc66e59fc5 --- /dev/null +++ b/yang-models/_3gpp-5gc-nrm-managed-nfprofile.yang @@ -0,0 +1,410 @@ +module _3gpp-5gc-nrm-managed-nfprofile { + yang-version 1.1; + + namespace urn:3gpp:sa5:_3gpp-5gc-nrm-managed-nfprofile; + prefix mnfp3gpp; + + import _3gpp-common-yang-types { prefix types3gpp; } + import ietf-inet-types { prefix inet; } + import ietf-yang-types { prefix yang; } + import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; } + +organization "3gpp SA5"; +contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; +description "NF profile class. +Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, +TTA, TTC). All rights reserved."; + reference "3GPP TS 29.510"; + + revision 2025-11-06 { reference CR-1639 ; } + revision 2025-11-06 { reference "initial revision"; } + + grouping SPNInfoIdGrp { + description "This data type represents the SNPN identification + consisting of MCC, MNC, and optionally NID."; + leaf mcc { + type string; + description "Mobile Country Code (MCC) of the SNPN."; + } + + leaf mnc { + type string; + description "Mobile Network Code (MNC) of the SNPN."; + } + + leaf nId { + type string; + description "Network Identifier (NID) of the SNPN."; + } + } + + grouping SupiRangeGrp { + leaf start { + description "First value identifying the start ofa SUPI range.To be + used when the range of SUPI's can be represented as a numeric range + (e.g., IMSI ranges)."; + type string { + pattern '^[0-9]+$'; + } + } + + leaf end { + description "Last value identifying the end of a SUPI range.To be + used when the range of SUPI's can be represented as a numeric range + (e.g. IMSI ranges)."; + type string { + pattern '^[0-9]+$'; + } + } + + leaf pattern { + description "Pattern representing the set of SUPI's belonging to + this range.A SUPI value is considered part of the range if and + only if the SUPI string fully matches the regular expression."; + type string; + } + } + + grouping ConditionItemGrp { + description "This data type represents a single condition item that + shall be evaluated to determine whether a discovered NF (Service) + Instance shall be selected."; + + leaf consumerNfTypes { + description "It represents the NF types of the consumers for + which the conditions included in this ConditionItem apply. + If this attribute is absent, the conditions are applicable + to all NF consumer types."; + type types3gpp:NfType; + } + leaf serviceFeature { + description "It represents a feature number of that NF Service + Instance,under CANARY_RELEASE status. This attribute only + applies when the selectionConditions, where this + ConditionItem is included, is included in a NF Service Instance + This condition is evaluated to when the service requests + froma consumer of this NF Service Instance require the support + of the indicated feature on the NF Service Instance."; + type uint32; // positive integer, 0 excluded by context + } + leaf vsServiceFeature { + description "It represents a Vendor-Specific feature + number of thatNF Service Instance, under CANARY_RELEASE + status. This attribute only applies when the + selectionConditions, where this ConditionItem is included, + is included in a NF Service Instance.This condition is + evaluated to true when the service requests from a + consumer of this NF Service Instance require the support + of the indicated Vendor-Specific feature on the NF + Service Instance."; + type uint32; + } + list supiRangeList { + description "It represents a set of SUPIs for which + the NF (Service) instance under CANARY_RELEASE status shall + be selected."; + key idx; + leaf idx { type uint32; } + uses SupiRangeGrp; + } + list gpsiRangeList { + description "It represents a set of GPSIs for which the NF + (Service) + instance under CANARY_RELEASE status shall be selected"; + min-elements 1; + key idx; + leaf idx { type uint32; } + uses IdentityRange; + } + list impuRangeList { + description "It represents a set of IMS Public Identities + for which the NF (Service) instance under CANARY_RELEASE + status shall be selected"; + min-elements 1; + key idx; + leaf idx { type uint32; } + uses IdentityRange; + } + list impiRangeList { + description "It represents a set of IMS Private Identities + for which theNF (Service) instance under + CANARY_RELEASE status shall be selected."; + min-elements 1; + key idx; + leaf idx { type uint32; } + uses IdentityRange; + } + leaf peiList { + description "It represents a set of PEIs of the UEs for + which the NF(Service) instance under CANARY_RELEASE status + shall be selected"; + type string; + } + list taiRangeList { + description "It represents a set of TAIs where the + NF(Service) instance under CANARY_RELEASE status shall + be selected for a certain UE"; + min-elements 1; + key idx; + leaf idx { type uint32; } + uses nfp3gpp:TaiRangeGrp; + } + leaf dnnList { + description " It represents a set of TAIs where the NF + (Service) instance under CANARY_RELEASE status shall be + selected for a certain UE"; + type string; + } + } + grouping PlmnSnssai { + list plmnId { + description "PLMN ID for which list of supported S-NSSAI(s) + is provided."; + min-elements 1; + max-elements 1; + key "mcc mnc"; + uses types3gpp:PLMNId; + } + list sNssaiList { + description "The specific list of S-NSSAIs supported + by the given PLMN."; + min-elements 1; + max-elements 1; + key "sst sd"; + uses types3gpp:SNssai; + } + leaf nid { + description "Network Identity; Shall be present if PlmnIdNid + identifies an SNPN "; + reference "see clauses 5.30.2.3, 5.30.2.9, 6.3.4, + and 6.3.8 in 3GPP TS 23.501 "; + type string; + } + } + + grouping IdentityRange { + leaf start { + description "First value identifying the start of an identity range. + To be used when the range of identities can be represented + as a numeric range (e.g., MSISDN ranges)."; + type string { + pattern '^[0-9]+$'; + } + } + leaf end {type string; } // dummy + leaf pattern {type string; } // dummy + } + +grouping ManagedNFProfileGrp { + + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + mandatory true; + type string; + } + + leaf nfType { + description "Type of Network Function."; + mandatory true; + type types3gpp:NfType; + } + + leaf heartBeatTimer { + description "Time in seconds expected between 2 consecutive + heart-beat messages from an NF Instance to the NRF. + It may be included in the registration request. + When present in the request it shall contain the + heartbeat time proposed by the NF service consumer."; + type uint16; + } + + leaf hostAddr { + mandatory true; + type inet:host ; + description "Host address of a NF"; + } + + leaf authzInfo { + description "This parameter defines NF Specific Service authorization + information. It shall include the NF type (s) and NF realms/origins + allowed to consume NF Service(s) of NF Service Producer "; + reference "TS 23.501"; + type string; + } + + list allowedPlmns { + description "PLMNs allowed to access the NF instance. + If not provided, any PLMN is allowed to access the NF."; + min-elements 1; + key "mcc mnc"; + uses types3gpp:PLMNId; + } + + list sNPNList { + key "mcc mnc nId"; + description "SNPN(s) of the Network Function. This attributeIE shall be + present if the NF pertains to one or more SNPNs."; + reference "TS 29.510"; + uses SPNInfoIdGrp; + } + + list allowedSNPNs { + description "SNPNs allowed to access the NF instance. + The absence of this attribute in the NF profile indicates that no SNPN, + other than the SNPN(s) registered in the snpnList attribute of the + NF Profile, is allowed to access the service instance"; + key "mCC mNC"; + uses types3gpp:SNPNIdGrp; + } + + leaf-list allowedNfTypes { + description "Type of the NFs allowed to access the NF instance. + If not provided, any NF type is allowed to access the NF."; + min-elements 1; + type types3gpp:NfType; + } + + leaf-list allowedNfDomains { + description "Pattern (regular expression according to the ECMA-262 + dialect [75]) representing the NF domain names within the PLMN of + the NRF allowed to access the NF instance If not provided, + any NF domain is allowed to access the NF."; + type string; + } + + list allowedNSSAIs { + description "S-NSSAI of the allowed slices to access the NF instance. + If not provided, any slice is allowed to access the NF."; + key "sst sd"; + uses types3gpp:SNssai; + } + + leaf locality { + description "Operator defined information about the location + of the NF instance (e.g. geographic location, data center)."; + type string; + } + + leaf capacity { + description "Static capacity information in the range of 0-65535, + expressed as a weight relative to other NF instances of + the same type; if capacity is also present in the nfServiceList + parameters, those will have precedence over this value."; + type uint16; + } + + leaf-list recoveryTime { + description "Timestamp when the NF was (re)started. The NRF shall notify + NFs subscribed to receiving notifications of changes of the NF profile, + if the NF recoveryTime is changed"; + type yang:date-and-time; + } + leaf nfServicePersistence { + description "This parameter indicates whether the different service + instances of a same NF Service in the NF instance, supporting a same + API version, are capable to persist their resource state in shared + storage and therefore these resources are available after a new NF + service instance supporting the same API version is selected by a NF + Service Consumer "; + reference "TS 29.510"; + type boolean; + } + leaf-list nfSetIdList { + type string ; + min-elements 1; + description "A NF Set Identifier is a globally unique identifier of + a set of equivalent and interchangeable CP NFs from a given network + that provide distribution, redundancy and scalability + (see clause 5.21.3 of 3GPP TS 23.501 [2]).An NF Set Identifier shall + be constructed from the MCC, MNC, NID (for SNPN), NF type and a Set ID. + A NF Set Identifier shall be formatted as the following string: + set.set.5gc.mnc.mcc for a NF Set in a PLMN, or + set.set.5gc.nid.mnc.mcc for a NF Set + in a SNPN.At most one NF Set ID shall be indicated per PLMN-ID or SNPN + of the NF."; + } + leaf-list nfProfileChangesSupportInd { + description "This parameter indicates if the NF Service Consumer supports + or does not support receiving NF Profile Changes. It may be present in + the NFRegister or NFUpdate (NF Profile Complete Replacement) request and + shall be absent in the response (see Annex B 3GPP TS 29.510 [23]). "; + max-elements 1; + type boolean; + } + leaf-list nfProfilePartialUpdateChangesSupportInd { + description "It represents NF Profile Partial Update Changes Support + Indicator. TRUE: the NF Service Consumer supports receiving NF Profile + Changes in the response to an NF Profile Partial Update operation. + FALSE (default): the NF Service Consumer does not support receiving + NF Profile Changes in the response to an NF Profile Partial Update + operation"; + max-elements 1; + type boolean; + } + + list defaultNotificationSubscriptions { + description "Notification endpoints for different notification types. + This attribute may contain multiple default subscriptions for a same + notification type; in that case, those default subscriptions are used + as alternative notification endpoints."; + key notificationType; + min-elements 1; + uses types3gpp:DefaultNotificationSubscription; + } + leaf servingScope { + description "This parameter indicates the served geographical areas + of a NF instance."; + type string; + } + leaf-list lcHSupportInd { + description "This parameter indicates whether the NF supports or does + not support Load Control based on LCI Header."; + reference "clause 6.3 of 3gpp TS 29.500"; + max-elements 1; + type boolean; + } + leaf-list olcHSupportInd { + description "This parameter indicates whether the NF supports or does + not support Overload Control based on OCI Header ."; + reference "clause 6.4 of 3gpp TS 29.500"; + max-elements 1; + type boolean; + } + leaf-list nfSetRecoveryTimeList { + description "This parameter contains the recovery time of NF Set(s) + indicated by the NfSetId, where the NF instance belongs."; + type yang:date-and-time ; + max-elements 1; + } + leaf-list serviceSetRecoveryTimeList { + description "This parameter contains the recovery time of NF Service + Set(s) configured in the NF instance, which are indicated by the + NfServiceSetId"; + type yang:date-and-time ; + max-elements 1; + } + leaf scpDomains { + description "This parameter shall carry the list of SCP domains the + SCP belongs to, or the SCP domain the NF (other than SCP) or the SEPP + belongs to.."; + type string; + } + leaf vendorId { + description "Vendor ID of the NF instance, according to the + IANA-assigned SMI Network Management Private Enterprise Codes [77]. + allowedValues: 6 decimal digits; if the SMI code has less than + 6 digits, it shall be padded with leading digits 0 to complete + a 6-digit string value."; + type string; + } + + leaf-list interPlmnFqdn { + description "If the NF needs to be discoverable by other + NFs in a different PLMN, then an FQDN that is used + for inter-PLMN routing is specified."; + type inet:domain-name; + } + +} +} + diff --git a/yang-models/_3gpp-5gc-nrm-neffunction.yang b/yang-models/_3gpp-5gc-nrm-neffunction.yang index fec93a992b19aa759b837ad63150e5ea8292deeb..ff23641cf06dfe5baca7d5f390675697edfcf4e0 100755 --- a/yang-models/_3gpp-5gc-nrm-neffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-neffunction.yang @@ -10,8 +10,8 @@ module _3gpp-5gc-nrm-neffunction { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-common-top { prefix top3gpp; } - import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; } + import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -21,6 +21,8 @@ module _3gpp-5gc-nrm-neffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-11-06 { reference CR-1639 ; } + revision 2025-08-18 { reference CR-1557 ; } revision 2024-05-18 { reference CR-1273 ; } revision 2024-04-12 { reference CR-1218 ; } revision 2023-09-18 { reference CR-1103 ; } @@ -55,7 +57,7 @@ module _3gpp-5gc-nrm-neffunction { min-elements 1; key idx; leaf idx { type uint32 ; } - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } list dnnInfoList{ @@ -290,15 +292,18 @@ module _3gpp-5gc-nrm-neffunction { An S-NSSAI has an SST (Slice/Service type) and an optional SD (Slice Differentiator) field."; key "sd sst"; - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } list managedNFProfile { - description "This parameter defines profile for managed NF(See TS 23.501)"; + key idx; + leaf idx { type uint32; } min-elements 1; max-elements 1; - key idx; - uses types3gpp:ManagedNFProfile; + description "This data type represents a Profile definition of a + Managed NF "; + reference "See TS 23.501"; + uses mnfp3gpp:ManagedNFProfileGrp; } leaf-list capabilityList { diff --git a/yang-models/_3gpp-5gc-nrm-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-nfprofile.yang index 15dc5e0a1b9c10f942fe333f4f00e11d5da889a5..0cc63e3d6a1c83dc5eea3d7cd2a1b4d9cdba0215 100755 --- a/yang-models/_3gpp-5gc-nrm-nfprofile.yang +++ b/yang-models/_3gpp-5gc-nrm-nfprofile.yang @@ -12,10 +12,11 @@ module _3gpp-5gc-nrm-nfprofile { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "NF profile class. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 29.510"; + revision 2025-08-25 { reference CR-1557 ; } revision 2024-04-12 { reference CR-1218 ; } revision 2023-11-18 { reference CR-1103 ; } revision 2023-09-18 { reference CR-1043 ; } @@ -40,16 +41,7 @@ module _3gpp-5gc-nrm-nfprofile { mandatory true; type NFStatus; } - - leaf heartBeatTimer { - description "Time in seconds expected between 2 consecutive - heart-beat messages from an NF Instance to the NRF. - It may be included in the registration request. - When present in the request it shall contain the - heartbeat time proposed by the NF service consumer."; - type uint16; - } - + list plmnList { description "PLMN(s) of the Network Function. This IE shall be present if this information @@ -70,27 +62,7 @@ module _3gpp-5gc-nrm-nfprofile { key "sst sd"; uses Snssai; } - - list perPlmnSnssaiList { - description "This IE may be included when the list of - S-NSSAIs supported by the NF for each PLMN it is supporting - is different. When present, this IE shall include the S-NSSAIs - supported by the Network Function for each PLMN supported by - the Network Function. When present, this IE shall - override sNssais IE."; - min-elements 1; - key idx; - leaf idx { type uint32; } - uses PlmnSnssai; - } - - leaf-list nsiList { - description "NSI identities of the Network Function. - If not provided, the NF can serve any NSI."; - min-elements 1; - type string; - } - + leaf fqdn { description "FQDN of the Network Function. For AMF, the FQDN registered with the NRF shall be that of the AMF Name."; @@ -103,83 +75,7 @@ module _3gpp-5gc-nrm-nfprofile { for inter-PLMN routing is specified."; type inet:domain-name; } - - leaf-list ipv4Addresses { - description "IPv4 address(es) of the Network Function."; - min-elements 1; - type inet:ipv4-address; - } - - leaf-list ipv6Addresses { - description "IPv6 address(es) of the Network Function."; - min-elements 1; - type inet:ipv6-address; - } - - list allowedPlmns { - description "PLMNs allowed to access the NF instance. - If not provided, any PLMN is allowed to access the NF."; - - min-elements 1; - key "mcc mnc"; - uses types3gpp:PLMNId; - } - - leaf-list allowedNfTypes { - description "Type of the NFs allowed to access the NF instance. - If not provided, any NF type is allowed to access the NF."; - min-elements 1; - type types3gpp:NfType; - } - - leaf-list allowedNfDomains { - description "Pattern representing the NF domain names allowed - to access the NF instance. If not provided, - any NF domain is allowed to access the NF."; - min-elements 1; - type string; - } - - list allowedNssais { - description "S-NSSAI of the allowed slices to access the NF instance. - If not provided, any slice is allowed to access the NF."; - min-elements 1; - key "sst sd"; - uses Snssai; - } - - leaf priority { - description "Priority (relative to other NFs of the same type) - in the range of 0-65535, to be used for NF selection; - lower values indicate a higher priority. - If priority is also present in the nfServiceList - parameters, - those will have precedence over this value. - The NRF may overwrite the received priority value - when exposing - an NFProfile with the Nnrf_NFDiscovery service."; - type uint16; - } - - leaf capacity { - description "Static capacity information in the range of 0-65535, - expressed as a weight relative to other NF instances of - the same type; if capacity is also present in the nfServiceList - parameters, those will have precedence over this value."; - type uint16; - } - - leaf load { - description "Dynamic load information, ranged from 0 to 100, - indicates the current load percentage of the NF."; - type types3gpp:Load; - } - - leaf locality { - description "Operator defined information about the location - of the NF instance (e.g. geographic location, data center)."; - type string; - } + grouping udrInfo { diff --git a/yang-models/_3gpp-5gc-nrm-nfservice.yang b/yang-models/_3gpp-5gc-nrm-nfservice.yang index 82cf61e877afc9c176cef6aa8af3b5df98617b2b..2dfd8ea5d8cc66331e1cd2764d42a39585988da4 100755 --- a/yang-models/_3gpp-5gc-nrm-nfservice.yang +++ b/yang-models/_3gpp-5gc-nrm-nfservice.yang @@ -7,7 +7,6 @@ module _3gpp-5gc-nrm-nfservice { import _3gpp-common-yang-types { prefix types3gpp; } import ietf-yang-types { prefix yang; } import ietf-inet-types { prefix inet; } - import _3gpp-5g-common-yang-types { prefix types5g3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -16,6 +15,7 @@ module _3gpp-5gc-nrm-nfservice { TTA, TTC). All rights reserved."; reference "3GPP TS 29.510"; + revision 2025-08-18 { reference CR-1557; } revision 2023-09-18 { reference CR-1043 ; } revision 2021-01-25 { reference CR-0454 ; } revision 2020-11-05 { reference CR-0412 ; } @@ -133,7 +133,7 @@ module _3gpp-5gc-nrm-nfservice { min-elements 1; //optional support key "sd sst"; - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } leaf priority { diff --git a/yang-models/_3gpp-5gc-nrm-ngeirfunction.yang b/yang-models/_3gpp-5gc-nrm-ngeirfunction.yang index 2c8c1a4fb08a95567e2143ae740828119f1a1e8c..c25fda301a45e1886dd8a1623bb80423f36dcb3d 100755 --- a/yang-models/_3gpp-5gc-nrm-ngeirfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-ngeirfunction.yang @@ -9,15 +9,17 @@ module _3gpp-5gc-nrm-ngeirfunction { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-common-top { prefix top3gpp; } + import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the 5G-EIR function in 5GC. For more information about the 5G-EIR, see 3GPP TS 23.501. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-11-06 { reference CR-1639 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-01-07 { reference CR-0643; } revision 2020-11-06 { reference CR-0412 ; } @@ -49,14 +51,18 @@ module _3gpp-5gc-nrm-ngeirfunction { //optional support reference "3GPP TS 23.003"; key "sd sst"; - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } list managedNFProfile { key idx; + leaf idx { type uint32; } min-elements 1; max-elements 1; - uses types3gpp:ManagedNFProfile; + description "This data type represents a Profile definition of a + Managed NF "; + reference "See TS 23.501"; + uses mnfp3gpp:ManagedNFProfileGrp; } list commModelList { diff --git a/yang-models/_3gpp-5gc-nrm-nrffunction.yang b/yang-models/_3gpp-5gc-nrm-nrffunction.yang index 25507c96a06d34749cc73e19bfcd27090210c93f..bb4f311161d62f84291fa8fab8e336f2742c85b0 100755 --- a/yang-models/_3gpp-5gc-nrm-nrffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nrffunction.yang @@ -10,7 +10,6 @@ module _3gpp-5gc-nrm-nrffunction { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; } import _3gpp-common-top { prefix top3gpp; } - import _3gpp-5g-common-yang-types { prefix types5g3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -20,6 +19,7 @@ module _3gpp-5gc-nrm-nrffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-08-18 { reference CR-1557; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2020-11-08 { reference CR-0412 ; } @@ -66,7 +66,7 @@ module _3gpp-5gc-nrm-nrffunction { //optional support reference "3GPP TS 23.003"; key "sd sst"; - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } list nFProfileList { diff --git a/yang-models/_3gpp-5gc-nrm-nssffunction.yang b/yang-models/_3gpp-5gc-nrm-nssffunction.yang index 315ae9ebcb5fe386566487b0defd21c051c147e8..478b411b11c02b76d10e381dcdd713c230f8de2a 100755 --- a/yang-models/_3gpp-5gc-nrm-nssffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nssffunction.yang @@ -9,16 +9,18 @@ module _3gpp-5gc-nrm-nssffunction { import ietf-inet-types { prefix inet; } import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-top { prefix top3gpp; } - import _3gpp-5g-common-yang-types { prefix types5g3gpp; } + import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the NSSF function in 5GC. For more information about the NSSF, see 3GPP TS 23.501. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-11-06 { reference CR-1639 ; } + revision 2025-08-18 { reference CR-1557; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2020-11-08 { reference CR-0412 ; } @@ -56,7 +58,7 @@ module _3gpp-5gc-nrm-nssffunction { reference "3GPP TS 23.003"; key "sd sst"; - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } leaf-list cNSIIdList { @@ -70,10 +72,13 @@ module _3gpp-5gc-nrm-nssffunction { list managedNFProfile { key idx; + leaf idx { type uint32; } min-elements 1; max-elements 1; - description "Profile definition of a Managed NF (See TS 23.501)"; - uses types3gpp:ManagedNFProfile; + description "This data type represents a Profile definition of a + Managed NF "; + reference "See TS 23.501"; + uses mnfp3gpp:ManagedNFProfileGrp; } } diff --git a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang index 5fe7eb7ae142767122d471d1be5edf12e3fed2bf..2b89b0b7971b195c59175961b43dc284c832230a 100755 --- a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang @@ -12,15 +12,19 @@ module _3gpp-5gc-nrm-nwdaffunction { import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; } + import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the NWDAF function in 5GC. For more information about the NWDAF, see 3GPP TS 23.501. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-11-06 { reference CR-1639 ; } + revision 2025-08-18 { reference CR-1557; } + revision 2024-08-06 { reference CR-1130; } revision 2024-04-12 { reference CR-1218; } revision 2023-09-18 { reference CR-1043; } revision 2023-04-26 { reference CR-0916; } @@ -99,7 +103,7 @@ module _3gpp-5gc-nrm-nwdaffunction { supporting."; reference "3GPP TS 23.003"; key "sd sst"; - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } list trackingAreaList { @@ -256,7 +260,7 @@ module _3gpp-5gc-nrm-nwdaffunction { leaf idx { type string; } - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } leaf-list cNSIId { @@ -279,7 +283,8 @@ module _3gpp-5gc-nrm-nwdaffunction { } grouping NWDAFFunctionGrp { - description "Represents the NWDAFFunction IOC"; + description "The NWDAFFunction IOC includes attributes inherited from + ManagedFunction IOC (defined in TS 28.622)"; uses mf3gpp:ManagedFunctionGrp; list pLMNInfoList { @@ -289,7 +294,6 @@ module _3gpp-5gc-nrm-nwdaffunction { key "idx"; leaf idx { type uint32; } uses types3gpp:PLMNId; - uses types5g3gpp:SNssai; } leaf sBIFQDN { @@ -300,10 +304,13 @@ module _3gpp-5gc-nrm-nwdaffunction { list managedNFProfile { key idx; + leaf idx { type uint32; } min-elements 1; max-elements 1; - description "Profile definition of a Managed NF (See TS 23.501)"; - uses types3gpp:ManagedNFProfile; + description "This data type represents a Profile definition of a + Managed NF "; + reference "See TS 23.501"; + uses mnfp3gpp:ManagedNFProfileGrp; } list commModelList { @@ -319,8 +326,9 @@ module _3gpp-5gc-nrm-nwdaffunction { key idx; min-elements 1; description "The attribute specifies a list of NetworkSliceInfo which - is defined as a datatype (see clause 5.3.95). It can be used by the - NWDAF to facilitate the data collection from OAM."; + is defined as a datatype (see clause 5.3.95). It is used by an + authorized consumer, e.g. NWDAF to facilitate the data collection + from OAM."; leaf idx { type string; } @@ -393,4 +401,4 @@ module _3gpp-5gc-nrm-nwdaffunction { uses mf3gpp:ManagedFunctionContainedClasses; } } -} \ No newline at end of file +} diff --git a/yang-models/_3gpp-5gc-nrm-pcffunction.yang b/yang-models/_3gpp-5gc-nrm-pcffunction.yang index 673c13acc2eb11880d4c3a42dcaace31ff520599..4d8938db6ca251e999cf0c98c1fe10f8637d4d6c 100755 --- a/yang-models/_3gpp-5gc-nrm-pcffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-pcffunction.yang @@ -10,15 +10,18 @@ module _3gpp-5gc-nrm-pcffunction { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-common-top { prefix top3gpp; } + import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the PCF function in 5GC. For more information about the PCF, see 3GPP TS 23.501. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-11-06 { reference CR-1639 ; } + revision 2025-08-18 { reference CR-1557; } revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } @@ -58,16 +61,20 @@ module _3gpp-5gc-nrm-pcffunction { //optional support reference "3GPP TS 23.003"; key "sd sst"; - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } list managedNFProfile { key idx; + leaf idx { type uint32; } min-elements 1; max-elements 1; - description "Profile definition of a Managed NF (See TS 23.501)"; - uses types3gpp:ManagedNFProfile; + description "This data type represents a Profile definition of a + Managed NF "; + reference "See TS 23.501"; + uses mnfp3gpp:ManagedNFProfileGrp; } + list commModelList { min-elements 1; key "groupId"; diff --git a/yang-models/_3gpp-5gc-nrm-smffunction.yang b/yang-models/_3gpp-5gc-nrm-smffunction.yang index ca37a43d4c235d3cd8fa4b866f4f5c4e03a38fe8..5fee82f3a3d3b5fdc70049ca56dc1b0cd5db4e12 100755 --- a/yang-models/_3gpp-5gc-nrm-smffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-smffunction.yang @@ -9,14 +9,17 @@ module _3gpp-5gc-nrm-smffunction { import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import ietf-inet-types { prefix inet; } import _3gpp-common-top { prefix top3gpp; } + import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "SMFFunction derived from basic ManagedFunction. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-11-06 { reference CR-1639 ; } + revision 2025-08-18 { reference CR-1557; } revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } @@ -61,15 +64,18 @@ module _3gpp-5gc-nrm-smffunction { (Slice Differentiator) field."; reference "3GPP TS 23.003"; key "sd sst"; - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } list managedNFProfile { key idx; + leaf idx { type uint32; } min-elements 1; max-elements 1; - description "Profile definition of a Managed NF (See TS 23.501)"; - uses types3gpp:ManagedNFProfile; + description "This data type represents a Profile definition of a + Managed NF "; + reference "See TS 23.501"; + uses mnfp3gpp:ManagedNFProfileGrp; } list commModelList { diff --git a/yang-models/_3gpp-5gc-nrm-smsffunction.yang b/yang-models/_3gpp-5gc-nrm-smsffunction.yang index 61c7d12424779ba3eaeba23bd72ec177208b7a15..27c93cc2b1dabdaf01f22dd2ba1d0c093cc6b685 100755 --- a/yang-models/_3gpp-5gc-nrm-smsffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-smsffunction.yang @@ -9,6 +9,7 @@ module _3gpp-5gc-nrm-smsffunction { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-common-top { prefix top3gpp; } + import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; } organization "3gpp SA5"; description "This IOC represents the SMSF function defined in 3GPP TS 23.501. @@ -16,6 +17,7 @@ module _3gpp-5gc-nrm-smsffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-11-06 { reference CR-1639 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; } @@ -39,8 +41,13 @@ module _3gpp-5gc-nrm-smsffunction { list managedNFProfile { key idx; + leaf idx { type uint32; } min-elements 1; - uses types3gpp:ManagedNFProfile; + max-elements 1; + description "This data type represents a Profile definition of a + Managed NF "; + reference "See TS 23.501"; + uses mnfp3gpp:ManagedNFProfileGrp; } list commModelList { diff --git a/yang-models/_3gpp-5gc-nrm-udmfunction.yang b/yang-models/_3gpp-5gc-nrm-udmfunction.yang index 319015d161e6b5a43788d8085889afe7453c88d9..4adc1024ade5d1cdb93503a0668b8ea3c53aafdf 100755 --- a/yang-models/_3gpp-5gc-nrm-udmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-udmfunction.yang @@ -10,15 +10,18 @@ module _3gpp-5gc-nrm-udmfunction { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-common-top { prefix top3gpp; } + import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the UDM function in 5GC. For more information about the UDM, see 3GPP TS 23.501. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-11-06 { reference CR-1639 ; } + revision 2025-08-18 { reference CR-1557; } revision 2024-04-04 { reference CR-1139; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } @@ -56,15 +59,18 @@ module _3gpp-5gc-nrm-udmfunction { //optional support reference "3GPP TS 23.003"; key "sd sst"; - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } list managedNFProfile { key idx; + leaf idx { type uint32; } min-elements 1; max-elements 1; - description "Profile definition of a Managed NF (See TS 23.501)"; - uses types3gpp:ManagedNFProfile; + description "This data type represents a Profile definition of a + Managed NF "; + reference "See TS 23.501"; + uses mnfp3gpp:ManagedNFProfileGrp; } list commModelList { diff --git a/yang-models/_3gpp-5gc-nrm-udrfunction.yang b/yang-models/_3gpp-5gc-nrm-udrfunction.yang index 1118fd1431dbcd7d2f73380054494f9fe96194fa..494a1f86257df01c00bad43ac4e446bff9e05f58 100755 --- a/yang-models/_3gpp-5gc-nrm-udrfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-udrfunction.yang @@ -9,16 +9,18 @@ module _3gpp-5gc-nrm-udrfunction { import ietf-inet-types { prefix inet; } import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-top { prefix top3gpp; } - import _3gpp-5g-common-yang-types { prefix types5g3gpp; } + import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the UDR function in 5GC. For more information about the UDR, see 3GPP TS 23.501. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-11-06 { reference CR-1639 ; } + revision 2025-08-18 { reference CR-1557; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2020-11-08 { reference CR-0412 ; } @@ -56,15 +58,18 @@ module _3gpp-5gc-nrm-udrfunction { //optional support reference "3GPP TS 23.003"; key "sd sst"; - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } list managedNFProfile { key idx; + leaf idx { type uint32; } min-elements 1; max-elements 1; - description "Profile definition of a Managed NF (See TS 23.501)"; - uses types3gpp:ManagedNFProfile; + description "This data type represents a Profile definition of a + Managed NF "; + reference "See TS 23.501"; + uses mnfp3gpp:ManagedNFProfileGrp; } } diff --git a/yang-models/_3gpp-5gc-nrm-udsffunction.yang b/yang-models/_3gpp-5gc-nrm-udsffunction.yang index 553ca7d5aa35cc2a288da7e5de96d66b71323d9f..d5ad23dd1d82c9e3cb9243a41f2941ea479bc2d2 100755 --- a/yang-models/_3gpp-5gc-nrm-udsffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-udsffunction.yang @@ -9,16 +9,18 @@ module _3gpp-5gc-nrm-udsffunction { import ietf-inet-types { prefix inet; } import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-top { prefix top3gpp; } - import _3gpp-5g-common-yang-types { prefix types5g3gpp; } + import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the UDSF function which can be interacted with any other 5GC NF defined in 3GPP TS 23.501. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-11-06 { reference CR-1639 ; } + revision 2025-08-18 { reference CR-1557; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2020-11-08 { reference CR-0412 ; } @@ -56,16 +58,18 @@ module _3gpp-5gc-nrm-udsffunction { //optional support reference "3GPP TS 23.003"; key "sd sst"; - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } list managedNFProfile { key idx; + leaf idx { type uint32; } min-elements 1; max-elements 1; - description "Managed Network Function profile"; - reference "3GPP TS 23.501"; - uses types3gpp:ManagedNFProfile; + description "This data type represents a Profile definition of a + Managed NF "; + reference "See TS 23.501"; + uses mnfp3gpp:ManagedNFProfileGrp; } } diff --git a/yang-models/_3gpp-5gc-nrm-upffunction.yang b/yang-models/_3gpp-5gc-nrm-upffunction.yang index 0c4a89df44c48865d6feb192e050397147fd531a..149087a55a3c00821131644188adc46c798bacfb 100755 --- a/yang-models/_3gpp-5gc-nrm-upffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-upffunction.yang @@ -8,14 +8,17 @@ module _3gpp-5gc-nrm-upffunction { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-common-top { prefix top3gpp; } + import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "UPFFunction derived from basic ManagedFunction. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-11-06 { reference CR-1639 ; } + revision 2025-08-18 { reference CR-1557; } revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } @@ -52,15 +55,18 @@ module _3gpp-5gc-nrm-upffunction { (Slice Differentiator) field."; reference "3GPP TS 23.003"; key "sd sst"; - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } list managedNFProfile { key idx; + leaf idx { type uint32; } min-elements 1; max-elements 1; - description "Profile definition of a Managed NF (See TS 23.501)"; - uses types3gpp:ManagedNFProfile; + description "This data type represents a Profile definition of a + Managed NF "; + reference "See TS 23.501"; + uses mnfp3gpp:ManagedNFProfileGrp; } leaf-list supportedBMOList { diff --git a/yang-models/_3gpp-common-filemanagement.yang b/yang-models/_3gpp-common-filemanagement.yang index 1e03291afae984f4b8f63e2155f954999b59d817..0a78825ae24aab56bb1ce9db30bb71e326ad2832 100644 --- a/yang-models/_3gpp-common-filemanagement.yang +++ b/yang-models/_3gpp-common-filemanagement.yang @@ -8,6 +8,7 @@ module _3gpp-common-filemanagement { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } + import ietf-inet-types { prefix inet; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -17,6 +18,7 @@ module _3gpp-common-filemanagement { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM)"; + revision 2024-11-12 { reference CR-0473 ; } revision 2023-09-18 { reference CR-0271 ; } revision 2023-02-14 { reference CR-0234; } revision 2022-10-24 { reference CR-0196; } @@ -52,12 +54,22 @@ module _3gpp-common-filemanagement { uses top3gpp:Top_Grp; leaf fileLocation { - description "Provides the location of a file. - allowedValues: File URI (See RFC 8089)"; - mandatory true; - type string; + type inet:uri ; yext3gpp:notNotifyable; yext3gpp:inVariant; + description "Location of the file incl. the file transfer protocol, + and the file name for the case the file content cannot be retrieved + by reading the 'fileContent' attribute. + + The allowed file transfer protocols are: + - sftp + - ftpes + - https + + Examples: + 'sftp://companyA.com/datastore/fileName.xml', + 'https://companyA.com/ManagedElement=1/Files=1/File=1' + "; } leaf notificationRecipientAddress { diff --git a/yang-models/_3gpp-common-files.yang b/yang-models/_3gpp-common-files.yang index 9317e769fee47aff7c2d02622f000e10b3b99ecd..a9c934a71b0270bbc36c2bb86e2a7630b01ee20b 100644 --- a/yang-models/_3gpp-common-files.yang +++ b/yang-models/_3gpp-common-files.yang @@ -13,7 +13,7 @@ module _3gpp-common-files { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of File retrieval NRM fragment including the IOCs File and Files. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -24,41 +24,54 @@ module _3gpp-common-files { Generic Network Resource Model (NRM) Integration Reference Point (IRP); Information Service (IS)"; - - revision 2024-05-11 { reference CR-0362 ; } - revision 2023-09-18 { reference CR-0271 ; } + + // the file is common for r17,18,19 + revision 2025-07-01 { reference "CR-0557 CR-0558 CR-0559"; } + revision 2024-05-25 { reference "CR-0361 CR-0362"; } + revision 2023-09-18 { reference "CR-0270 CR-0271"; } revision 2022-09-28 { reference CR-0191; } grouping FileGrp { description "Represents the File IOC."; - leaf fileLocation { - type inet:uri ; + choice fileRetrievalMethod { mandatory true; - yext3gpp:notNotifyable ; - yext3gpp:inVariant ; - description "Location of the file incl. the file transfer protocol, - and the file name for the case the file content cannot be retrieved - by reading the 'fileContent' attribute. - - The allowed file transfer protocols are: - - sftp - - ftpes - - https - - Examples: - 'sftp://companyA.com/datastore/fileName.xml', - 'https://companyA.com/ManagedElement=1/Files=1/File=1' - "; + leaf fileLocation { + type inet:uri ; + config false; + yext3gpp:notNotifyable ; + yext3gpp:inVariant ; + description "Location of the file incl. the file transfer protocol, + and the file name. + + The allowed file transfer protocols are: + - sftp + - ftpes + - https + + Examples: + 'sftp://companyA.com/datastore/fileName.xml', + 'https://companyA.com/ManagedElement=1/Files=1/File=1' + "; + } + + leaf fileContent { + type binary ; + config false; + yext3gpp:notNotifyable ; + yext3gpp:inVariant ; + description "File content as a Base64 encoded string according to + RFC 4648 section 4."; + } } leaf fileCompression { type string ; - mandatory true; + config false; yext3gpp:notNotifyable ; yext3gpp:inVariant ; description "Name of the algorithm used for compressing the file. - An empty or absent 'fileCompression' parameter indicates the file is + An absent 'fileCompression' parameter indicates the file is not compressed. The MnS producer selects the compression algorithm. It is encouraged to use popular algorithms such as GZIP."; } @@ -67,6 +80,7 @@ module _3gpp-common-files { type uint64 ; mandatory true; units bytes; + config false; yext3gpp:notNotifyable ; yext3gpp:inVariant ; description "Size of the file"; @@ -82,6 +96,7 @@ module _3gpp-common-files { enum PROPRIETARY; } mandatory true; + config false; yext3gpp:notNotifyable ; yext3gpp:inVariant ; description "Type of the management data stored in the file."; @@ -89,16 +104,18 @@ module _3gpp-common-files { leaf fileFormat { type string ; - mandatory true; + config false; yext3gpp:notNotifyable ; yext3gpp:inVariant ; - description "Identifier of the XML or ASN.1 schema (incl. its version) - used to produce the file content."; + description "Identifier of the schema (incl. its version) + used to produce the file content. If there is no schema for the file + or it is not available, the fileFormat parameter is absent."; } leaf fileReadyTime { type yang:date-and-time ; mandatory true; + config false; yext3gpp:notNotifyable ; yext3gpp:inVariant ; description "Date and time, when the file was closed (the last time) @@ -108,22 +125,15 @@ module _3gpp-common-files { leaf fileExpirationTime { type yang:date-and-time ; - mandatory true; + config false; yext3gpp:notNotifyable ; yext3gpp:inVariant ; description "Date and time after which the file may be deleted."; } - - leaf fileContent { - type string ; // String is very restrictive - mandatory true; - yext3gpp:notNotifyable ; - yext3gpp:inVariant ; - description "File content"; - } leaf-list jobRef { type types3gpp:DistinguishedName ; + config false; yext3gpp:notNotifyable ; yext3gpp:inVariant ; description "Object instance of the 'PerfMetricJob' or 'TraceJob' @@ -132,6 +142,7 @@ module _3gpp-common-files { leaf jobId { type string ; + config false; yext3gpp:notNotifyable ; yext3gpp:inVariant ; description "Identifier of a PerfMetricJob job or a TraceJob."; @@ -142,12 +153,14 @@ module _3gpp-common-files { description "Represents the Files IOC."; leaf numberOfFiles { type uint64 ; + config false; yext3gpp:notNotifyable ; description "Number of files in a file collection."; } leaf-list jobRef { type types3gpp:DistinguishedName ; + config false; yext3gpp:notNotifyable ; yext3gpp:inVariant ; description "Object instance of the 'PerfMetricJob' or 'TraceJob' @@ -156,6 +169,7 @@ module _3gpp-common-files { leaf jobId { type string ; + config false; yext3gpp:notNotifyable ; yext3gpp:inVariant ; description "Identifier of a PerfMetricJob job or a TraceJob."; @@ -210,7 +224,7 @@ module _3gpp-common-files { The attribute '_linkToFiles' allows a MnS consumer to create simple and targeted subscriptions for 'notifyFileReady'and 'notifyFilePreparationError', or - 'notifyMOICreation', 'notifyMOIChanges' and 'notifyFilePreparationError' + 'notifyMOICreation', 'notifyMOIChanges' and 'notifyFilePreparationError' related to 'File' instances created or deleted under the 'Files' instance of a specific job. The subscription needs to scope simply objects one level below the 'Files' object. @@ -244,36 +258,20 @@ module _3gpp-common-files { The attributes 'fileSize', 'fileCompression', 'fileDataType' and 'fileFormat' describe the file properties. - - The 'fileLocation' attribute indicates the address where the file can - be retrieved. The address includes the file transfer protocol (schema). - Allowed file transfer protocols are 'sftp', 'ftpes' and 'https'. - - The value of 'fileLocation' can be identical to or different from the - address of the 'File' instance. The attribute 'fileContent' is - provided for retrieving the actual file content. When identifying in - the Read request a 'File' instance and specifying only the - 'fileContent' attribute be returned, then only the file content shall - be returned in the response. Note, as usual, multiple attributes can - be specified to be returned, so that the file content together with - some or all file meta data attributes can be returned in response to - a single request. - - In case the 'fileLocation' specifies a location different than the - 'File' object location, then the attribute 'fileContent' cannot be - used for retrieving the file content. For example, the 'File' object - location may be given by - 'https://companyA.com/ManagedElement=1/Files=1/File=1' - and the value of the 'fileLocation' attribute by - 'sftp://companyA.com/datastore/fileName.xml' - - In this case the file needs to be retrieved using 'sftp' from - 'sftp://companyA.com/datastore/fileName.xml'. Attempts to read the - 'fileContent' attribute shall return an error. + + The MnS producer makes the file available by one of the following means: + - For retrieval via a file transfer protocol. The fileLocation attribute + indicates the address from where the file can be retrieved. The + address includes the file transfer protocol (schema). Allowed file + transfer protocols are 'sftp', 'ftpes' and 'https'. + - For retrieval of the file contents via a CM read operation. The + attribute fileContent is provided for retrieving the actual file + content. In this case, the name of the file is equal to the identity + of the File instance. When the file retrieval NRM fragment is used together with a data - collection job ('PerfMetricJob' or 'TraceJob') the following - provisions shall apply: + collection job (PerfMetricJob or TraceJob) the following provisions + shall apply: - The attributes 'jobRef' and 'jobId' shall be supported and present. They shall identify the job that the file is related to. diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index 223ea0033e5a50a5a854fbcdefe6038eaa11141a..f68452456f98d2ade1bc669a6395bc6db3dcbb76 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -12,10 +12,14 @@ module _3gpp-common-fm { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines a Fault Management model - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.111"; + revision 2025-11-06 { reference "CR-0056"; } + revision 2025-08-13 { reference "CR-0053 CR-0054"; } + revision 2025-05-01 { reference "CR-0042 CR-0043"; } // common for R18, R19 + revision 2025-03-25 { reference "CR-0025 CR-0026"; } revision 2024-05-12 { description "The definition of the module was from TS 28.623 to TS 28.111"; reference CR-0008 ; @@ -41,6 +45,10 @@ module _3gpp-common-fm { typedef eventType { type enumeration { + enum OTHER { + value 1; + } + enum COMMUNICATIONS_ALARM { value 2; } @@ -98,17 +106,231 @@ module _3gpp-common-fm { description "The possible alarm severities"; } + typedef probable-causes { + type enumeration { + enum INDETERMINATE { value 0; } + enum ALARM_INDICATION_SIGNAL { value 1; } + enum CALL_SETUP_FAILURE { value 2; } + enum DEGRADED_SIGNAL { value 3; } + enum FAR_END_RECEIVER_FAILURE { value 4; } + enum FRAMING_ERROR { value 5; } + enum LOSS_OF_FRAME { value 6; } + enum LOSS_OF_POINTER { value 7; } + enum LOSS_OF_SIGNAL { value 8; } + enum PAYLOAD_TYPE_MISMATCH { value 9; } + enum REMOTE_ALARM_INTERFACE { value 11; } + enum EXCESSIVE_BIT_ERROR_RATE { value 12; } + enum PATH_TRACE_MISMATCH { value 13; } + enum UNAVAILABLE { value 14; } + enum SIGNAL_LABEL_MISMATCH { value 15; } + enum LOSS_OF_MULTI_FRAME { value 16; } + enum COMMUNICATIONS_RECEIVE_FAILURE { value 17; } + enum COMMUNICATIONS_TRANSMIT_FAILURE { value 18; } + enum MODULATION_FAILURE { value 19; } + enum DEMODULATION_FAILURE { value 20; } + enum BACK_PLANE_FAILURE { value 51; } + enum DATA_SET_PROBLEM { value 52; } + enum EQUIPMENT_IDENTIFIER_DUPLICATION { value 53; } + enum EXTERNAL_IF_DEVICE_PROBLEM { value 54; } + enum LINE_CARD_PROBLEM { value 55; } + enum MULTIPLEXER_PROBLEM { value 56; } + enum NE_IDENTIFIER_DUPLICATION { value 57; } + enum POWER_PROBLEM { value 58; } + enum PROCESSOR_PROBLEM { value 59; } + enum PROTECTION_PATH_FAILURE { value 60; } + enum RECEIVER_FAILURE { value 61; } + enum REPLACEABLE_UNIT_MISSING { value 62; } + enum REPLACEABLE_UNIT_TYPE_MISMATCH { value 63; } + enum SYNCHRONIZATION_SOURCE_MISMATCH { value 64; } + enum TERMINAL_PROBLEM { value 65; } + enum TIMING_PROBLEM { value 66; } + enum TRANSMITTER_FAILURE { value 67; } + enum TRUNK_CARD_PROBLEM { value 68; } + enum REPLACEABLE_UNIT_PROBLEM { value 69; } + enum REAL_TIME_CLOCK_FAILURE { value 70; } + enum PROTECTION_MECHANISM_FAILURE { value 81; } + enum PROTECTING_RESOURCE_FAILURE { value 82; } + enum AIR_COMPRESSOR_FAILURE { value 101; } + enum AIR_CONDITIONING_FAILURE { value 102; } + enum AIR_DRYER_FAILURE { value 103; } + enum BATTERY_DISCHARGING { value 104; } + enum BATTERY_FAILURE { value 105; } + enum COMMERCIAL_POWER_FAILURE { value 106; } + enum COOLING_FAN_FAILURE { value 107; } + enum ENGINE_FAILURE { value 108; } + enum FIRE_DETECTOR_FAILURE { value 109; } + enum FUSE_FAILURE { value 110; } + enum GENERATOR_FAILURE { value 111; } + enum LOW_BATTERY_THRESHOLD { value 112; } + enum PUMP_FAILURE { value 113; } + enum RECTIFIER_FAILURE { value 114; } + enum RECTIFIER_HIGH_VOLTAGE { value 115; } + enum RECTIFIER_LOW_F_VOLTAGE { value 116; } + enum VENTILATION_SYSTEM_FAILURE { value 117; } + enum ENCLOSURE_DOOR_OPEN { value 118; } + enum EXPLOSIVE_GAS { value 119; } + enum FIRE { value 120; } + enum FLOOD { value 121; } + enum HIGH_HUMIDITY { value 122; } + enum HIGH_TEMPERATURE { value 123; } + enum HIGH_WIND { value 124; } + enum ICE_BUILD_UP { value 125; } + enum INTRUSION_DETECTION { value 126; } + enum LOW_FUEL { value 127; } + enum LOW_HUMIDITY { value 128; } + enum LOW_CABLE_PRESSURE { value 129; } + enum LOW_TEMPERATURE { value 130; } + enum LOW_WATER { value 131; } + enum SMOKE { value 132; } + enum TOXIC_GAS { value 133; } + enum EXTERNAL_POINT_FAILURE { value 136; } + enum STORAGE_CAPACITY_PROBLEM { value 151; } + enum MEMORY_MISMATCH { value 152; } + enum CORRUPT_DATA { value 153; } + enum OUT_OF_CPU_CYCLES { value 154; } + enum SOFTWARE_ENVIRONMENT_PROBLEM { value 155; } + enum SOFTWARE_DOWNLOAD_FAILURE { value 156; } + enum LOSS_OF_REAL_TIME { value 157; } + enum REINITIALIZED { value 158; } + enum EXCESSIVE_ERROR_RATE { value 203; } + enum ADAPTER_ERROR { value 301; } + enum APPLICATION_SUBSYSTEM_FAILURE { value 302; } + enum BANDWIDTH_REDUCED { value 303; } + enum COMMUNICATIONS_PROTOCOL_ERROR { value 305; } + enum COMMUNICATIONS_SUBSYSTEM_FAILURE { value 306; } + enum CONFIGURATION_OR_CUSTOMIZATION_ERROR { value 307; } + enum CONGESTION { value 308; } + enum CPU_CYCLES_LIMIT_EXCEEDED { value 310; } + enum DATA_SET_OR_MODEM_ERROR { value 311; } + enum DTE_DCE_INTERFACE_ERROR { value 313; } + enum EQUIPMENT_MALFUNCTION { value 315; } + enum EXCESSIVE_VIBRATION { value 316; } + enum FILE_ERROR { value 317; } + enum HEATING_OR_VENTILATION_OR_COOLING_SYSTEM_PROBLEM { value 321; } + enum HUMIDITY_UNACCEPTABLE { value 322; } + enum INPUT_OUTPUT_DEVICE_ERROR { value 323; } + enum INPUT_DEVICE_ERROR { value 324; } + enum LAN_ERROR { value 325; } + enum LEAK_DETECTED { value 326; } + enum LOCAL_NODE_TRANSMISSION_ERROR { value 327; } + enum MATERIAL_SUPPLY_EXHAUSTED { value 330; } + enum OUT_OF_MEMORY { value 332; } + enum OUTPUT_DEVICE_ERROR { value 333; } + enum PERFORMANCE_DEGRADED { value 334; } + enum PRESSURE_UNACCEPTABLE { value 336; } + enum QUEUE_SIZE_EXCEEDED { value 339; } + enum RECEIVE_FAILURE { value 340; } + enum REMOTE_NODE_TRANSMISSION_ERROR { value 342; } + enum RESOURCE_AT_OR_NEARING_CAPACITY { value 343; } + enum RESPONSE_TIME_EXCESSIVE { value 344; } + enum RETRANSMISSION_RATE_EXCESSIVE { value 345; } + enum SOFTWARE_ERROR { value 346; } + enum SOFTWARE_PROGRAM_ABNORMALLY_TERMINATED { value 347; } + enum SOFTWARE_PROGRAM_ERROR { value 348; } + enum TEMPERATURE_UNACCEPTABLE { value 350; } + enum THRESHOLD_CROSSED { value 351; } + enum TOXIC_LEAK_DETECTED { value 353; } + enum TRANSMIT_FAILURE { value 354; } + enum UNDERLYING_RESOURCE_UNAVAILABLE { value 356; } + enum VERSION_MISMATCH { value 357; } + enum A_BIS_TO_BTS_INTERFACE_FAILURE { value 501; } + enum A_BIS_TO_TRX_INTERFACE_FAILURE { value 502; } + enum ANTENNA_PROBLEM { value 503; } + enum BATTERY_BREAKDOWN { value 504; } + enum BATTERY_CHARGING_FAULT { value 505; } + enum CLOCK_SYNCHRONIZATION_PROBLEM { value 506; } + enum COMBINER_PROBLEM { value 507; } + enum DISK_PROBLEM { value 508; } + enum EXCESSIVE_RECEIVER_TEMPERATURE { value 510; } + enum EXCESSIVE_TRANSMITTER_OUTPUT_POWER { value 511; } + enum EXCESSIVE_TRANSMITTER_TEMPERATURE { value 512; } + enum FREQUENCY_HOPPING_DEGRADED { value 513; } + enum FREQUENCY_HOPPING_FAILURE { value 514; } + enum FREQUENCY_REDEFINITION_FAILED { value 515; } + enum LINE_INTERFACE_FAILURE { value 516; } + enum LINK_FAILURE { value 517; } + enum LOSS_OF_SYNCHRONIZATION { value 518; } + enum LOST_REDUNDANCY { value 519; } + enum MAINS_BREAKDOWN_WITH_BATTERY_BACKUP { value 520; } + enum MAINS_BREAKDOWN_WITHOUT_BATTERY_BACKUP { value 521; } + enum POWER_SUPPLY_FAILURE { value 522; } + enum RECEIVER_ANTENNA_FAULT { value 523; } + enum RECEIVER_MULTICOUPLER_FAILURE { value 525; } + enum REDUCED_TRANSMITTER_OUTPUT_POWER { value 526; } + enum SIGNAL_QUALITY_EVALUATION_FAULT { value 527; } + enum TIMESLOT_HARDWARE_FAILURE { value 528; } + enum TRANSCEIVER_PROBLEM { value 529; } + enum TRANSCODER_PROBLEM { value 530; } + enum TRANSCODER_OR_RATE_ADAPTER_PROBLEM { value 531; } + enum TRANSMITTER_ANTENNA_FAILURE { value 532; } + enum TRANSMITTER_ANTENNA_NOT_ADJUSTED { value 533; } + enum TRANSMITTER_LOW_VOLTAGE_OR_CURRENT { value 535; } + enum TRANSMITTER_OFF_FREQUENCY { value 536; } + enum DATABASE_INCONSISTENCY { value 537; } + enum FILE_SYSTEM_CALL_UNSUCCESSFUL { value 538; } + enum INPUT_PARAMETER_OUT_OF_RANGE { value 539; } + enum INVALID_PARAMETER { value 540; } + enum INVALID_POINTER { value 541; } + enum MESSAGE_NOT_EXPECTED { value 542; } + enum MESSAGE_NOT_INITIALIZED { value 543; } + enum MESSAGE_OUT_OF_SEQUENCE { value 544; } + enum SYSTEM_CALL_UNSUCCESSFUL { value 545; } + enum TIMEOUT_EXPIRED { value 546; } + enum VARIABLE_OUT_OF_RANGE { value 547; } + enum WATCH_DOG_TIMER_EXPIRED { value 548; } + enum COOLING_SYSTEM_FAILURE { value 549; } + enum EXTERNAL_EQUIPMENT_FAILURE { value 550; } + enum EXTERNAL_POWER_SUPPLY_FAILURE { value 551; } + enum EXTERNAL_TRANSMISSION_DEVICE_FAILURE { value 552; } + enum REDUCED_ALARM_REPORTING { value 561; } + enum REDUCED_EVENT_REPORTING { value 562; } + enum REDUCED_LOGGING_CAPABILITY { value 563; } + enum SYSTEM_RESOURCES_OVERLOAD { value 564; } + enum BROADCAST_CHANNEL_FAILURE { value 565; } + enum CONNECTION_ESTABLISHMENT_ERROR { value 566; } + enum INVALID_MESSAGE_RECEIVED { value 567; } + enum INVALID_MSU_RECEIVED { value 568; } + enum LAPD_LINK_PROTOCOL_FAILURE { value 569; } + enum LOCAL_ALARM_INDICATION { value 570; } + enum REMOTE_ALARM_INDICATION { value 571; } + enum ROUTING_FAILURE { value 572; } + enum SS7_PROTOCOL_FAILURE { value 573; } + enum TRANSMISSION_ERROR { value 574; } + enum AUTHENTICATION_FAILURE { value 701; } + enum BREACH_OF_CONFIDENTIALITY { value 702; } + enum CABLE_TAMPER { value 703; } + enum DELAYED_INFORMATION { value 704; } + enum DENIAL_OF_SERVICE { value 705; } + enum DUPLICATE_INFORMATION { value 706; } + enum INFORMATION_MISSING { value 707; } + enum INFORMATION_MODIFICATION_DETECTED { value 708; } + enum INFORMATION_OUT_OF_SEQUENCE { value 709; } + enum INTRUSION_DETECTED { value 710; } + enum KEY_EXPIRED { value 711; } + enum NON_REPUDIATION_FAILURE { value 712; } + enum OUT_OF_HOURS_ACTIVITY { value 713; } + enum OUT_OF_SERVICE { value 714; } + enum PROCEDURAL_ERROR { value 715; } + enum UNAUTHORISED_ACCESS_ATTEMPT { value 716; } + enum UNEXPECTED_INFORMATION { value 717; } + enum UNSPECIFIED_REASON { value 718; } + } + description "Values are from the (informative) Annex B of 3GPP TS 28.111."; + } + grouping AlarmCommentGrp { leaf commentTime { type yang:date-and-time; config false; mandatory true; + yext3gpp:inVariant; description "Date and Time the comment was created."; } leaf commentUserId { type string; mandatory true; + yext3gpp:inVariant; description "It carries the identification of the user who made the comment."; } @@ -116,6 +338,7 @@ module _3gpp-common-fm { leaf commentSystemId { type string; mandatory true; + yext3gpp:inVariant; description "It carries the identification of the system ( Management System) from which the comment is made. That system supports the user that made the comment."; @@ -124,10 +347,146 @@ module _3gpp-common-fm { leaf commentText { type string; mandatory true; + yext3gpp:inVariant; description "It carries the textual comment."; } } + grouping ThresholdHysteresisGrp { + description "The ThresholdHysteresis defines the threshold boundaries to + control the hysteresis mechanism. + + The high attribute of ThresholdHysteresis identifies the higher value of + a threshold with hysteris, the integer type is used for counter + thresholds and the float type for gauge thresholds. The low attribute + of ThresholdHysteresis identifies the lower value of a threshold with + hysteresis, applicable only to gauge thresholds."; + + leaf high { + type union { + type int64; + type decimal64 { + fraction-digits 7; + } + } + mandatory true; + description "Higher value of a threshold with hysteris, the integer type + is used for counter thresholds and the float type for gauge + thresholds."; + } + + leaf low { + type decimal64 { + fraction-digits 7; + } + description "Lower value of a threshold with hysteresis, applicable + only to gauge thresholds."; + } + } + + grouping ThresholdLevelIndGrp { + description "The up attribute indicates for counter and gauge thresholds + that the threshold crossing occurred when going up. The down attribute + only indicates for gauge thresholds that the threshold crossing occurred + when going down, applicable only to gauge thresholds."; + + list up { + description "Indicates for counter and gauge thresholds that the + threshold crossing occurred when going up."; + max-elements 1; + key idx; + leaf idx { type int32; } + uses ThresholdHysteresisGrp; + } + + list down { + description "Indicates for gauge thresholds that the threshold crossing + occurred when going down, applicable only to gauge thresholds."; + max-elements 1; + key idx; + leaf idx { type int32; } + uses ThresholdHysteresisGrp; + } + } + + grouping ThresholdCrossingGrp { + description "The datatype indicates the crossed threshold + information regardless of the gauge threshold, which represents an + instantaneous value that changes over time, or the counter threshold, + which represents monotonically increasing cumulative quantity. + + The observedMeasurement attribute of TheresholdInfo specifies the name + of the monitored measurement that crossed the threshold and that + caused the notification (Rec. ITU-T X. 733[8]). The observedValue + attribute indicates the value of the gauge or counter which crossed + the threshold. This may be different from the threshold value if, for + example, the gauge may only take on discrete values. Integer values + are used for counters and float values for gauges (Rec. ITU-T X. 733). + Note that a 'number' type property can contain both integers and + floating point numbers. + + For the thresholdLevel attribute, in the case of a gauge, it specifies + a pair of threshold values, the first being the value of the crossed + threshold and the second, its corresponding hysteresis; in the case of + a counter, it specifies only the threshold value (Rec. ITU-T X. 733). + + For the armTime attribute, for a gauge threshold, it specifies the + time at which the threshold was last re-armed, namely the time after + the previous threshold crossing at which the hysteresis value of the + threshold was exceeded thus again permitting generation of + notifications when the threshold is crossed; for a counter threshold, + the later of the time at which the threshold offset was last applied, + or the time at which the counter was last initialized (for resettable + counters) (Rec. ITU-T X. 733)."; + + leaf observedMeasurement { + type string; + mandatory true; + description "The name of the monitored measurement that crossed the + threshold and that caused the notification (Rec. ITU-T X. 733 "; + } + + leaf observedValue { + type union { + type int64; + type decimal64 { + fraction-digits 7; + } + } + mandatory true; + description "The value of the gauge or counter which crossed the + threshold. This may be different from the threshold value if, for + example, the gauge may only take on discrete values. + Integer values are used for counters and float values for gauges + (Rec. ITU-T X. 733). Note that a 'number' type property can contain + both integers and floating point numbers."; + } + + list thresholdLevel { + description "In the case of a gauge the threshold level specifies + a pair of threshold values, the first being the value of the crossed + threshold and the second, its corresponding hysteresis; in the case + of a counter the threshold level specifies only the threshold value + (Rec. ITU-T X. 733)."; + max-elements 1; + key idx; + leaf idx { type int32; } + uses ThresholdLevelIndGrp; + } + + leaf armTime { + type yang:date-and-time; + description "For a gauge threshold, the time at which the threshold + was last re-armed, namely the time after the previous threshold + crossing at which the hysteresis value of the threshold was + exceeded thus again permitting generation of notifications when the + threshold is crossed. For a counter threshold, the later of the time + at which the threshold offset was last applied, or the time at + which the counter was last initialized (for resettable counters) + (Rec. ITU-T X. 733)"; + } + } + grouping AlarmRecordGrp { description "Contains alarm information of an alarmed object instance. A new record is created in the alarm list when an alarmed object @@ -171,6 +530,7 @@ module _3gpp-common-fm { mandatory true; config false ; yext3gpp:notNotifyable; + yext3gpp:inVariant; } leaf alarmChangedTime { @@ -198,6 +558,7 @@ module _3gpp-common-fm { leaf probableCause { type union { + type probable-causes; type int32; type string; } @@ -255,52 +616,13 @@ module _3gpp-common-fm { yext3gpp:notNotifyable; } - grouping ThresholdInfoGrp { - leaf measurementType { - type string; - mandatory true; - } - - leaf direction { - type enumeration { - enum INCREASING; - enum DECREASING; - } - mandatory true; - description " - If it is 'Increasing', the threshold crossing notification is - triggered when the measurement value equals or exceeds a - thresholdValue. - - If it is 'Decreasing', the threshold crossing notification is - triggered when the measurement value equals or below a - thresholdValue."; - } - - leaf thresholdLevel { - type string; - } - - leaf thresholdValue { - type string; - } - - leaf hysteresis { - type string; - description "The hysteresis has a threshold high and a threshold - low value that are different from the threshold value. - A hysteresis, therefore, defines the threshold-high and - threshold-low levels within which the measurementType value is - allowed to oscillate without triggering the threshold crossing - notification."; - } - } - list thresholdInfo { config false ; yext3gpp:notNotifyable; description "Indicates the crossed threshold"; - uses ThresholdInfoGrp; + key idx; + leaf idx { type int32; } + uses ThresholdCrossingGrp; } list stateChangeDefinition { @@ -382,7 +704,7 @@ module _3gpp-common-fm { } list comments { - yext3gpp:inVariant; + config false ; yext3gpp:notNotifyable; description "List of comments and data about the comments."; key idx; @@ -466,10 +788,13 @@ module _3gpp-common-fm { type string; config false ; yext3gpp:notNotifyable; + description "It carries the identity of the detector of the security alarm."; } list correlatedNotifications { key sourceObjectInstance; + config false ; + yext3gpp:notNotifyable; description "List of correlated notifications"; leaf sourceObjectInstance { diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index 233aa6f4a2ab338201ffe86eab7eb0c679110085..74c55b00edfd935f6023ce17e8e1b9dc64638615 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -4,6 +4,7 @@ module _3gpp-common-managed-element { prefix "me3gpp"; import _3gpp-common-yang-types { prefix types3gpp ; } + import _3gpp-common-yang-extensions { prefix yext3gpp ; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-measurements { prefix meas3gpp; } import _3gpp-common-subscription-control { prefix subscr3gpp; } @@ -12,13 +13,14 @@ module _3gpp-common-managed-element { import _3gpp-common-files { prefix files3gpp; } import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; } import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; } + import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines ManagedElement which will be augmented by other IOCs - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -33,6 +35,8 @@ module _3gpp-common-managed-element { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2025-03-24 { reference "CR-0517"; } + revision 2024-10-01 { reference "CR-0437,CR-0438" ; } revision 2024-01-30 { reference CR-0328 ; } revision 2023-11-14 { reference CR-0305 ; } revision 2023-09-18 { reference CR-0271 ; } @@ -49,6 +53,10 @@ module _3gpp-common-managed-element { revision 2019-06-17 { reference " S5-203316"; } revision 2019-05-08 { reference "Initial revision"; } + feature ECMappingRuleUnderManagedElement { + description "ECMappingRule shall be contained under ManagedElement."; + } + feature EcmConnectionInfoUnderManagedElement { description "The EcmConnectionInfo shall be contained under ManagedElement"; @@ -135,6 +143,7 @@ module _3gpp-common-managed-element { A Distingushed Name(DN) is defined by 3GPP TS 32.300, which splits the DN into a DN Prefix and Local DN"; type types3gpp:DistinguishedName; + yext3gpp:inVariant; } leaf userLabel { @@ -142,6 +151,7 @@ module _3gpp-common-managed-element { type string; } + leaf locationName { description "The physical location (e.g. an address) of an entity represented by a (derivative of) ManagedElement_. It may contain no @@ -304,5 +314,9 @@ module _3gpp-common-managed-element { uses econn3gpp:EcmConnectionInfoSubtree { if-feature EcmConnectionInfoUnderManagedElement; } + + uses ecmap3gpp:NRECMappingRuleSubtree { + if-feature ECMappingRuleUnderManagedElement; + } } } diff --git a/yang-models/_3gpp-common-managed-function.yang b/yang-models/_3gpp-common-managed-function.yang index ea4390cc348f5167fb4501fdb3fcbd70c2a9d8a3..efa2a1f3a9508e7d4de7a17e8657abd5c99a4f1f 100755 --- a/yang-models/_3gpp-common-managed-function.yang +++ b/yang-models/_3gpp-common-managed-function.yang @@ -13,7 +13,7 @@ module _3gpp-common-managed-function { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "The module defines a base class/grouping for major 3GPP functions. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.622 @@ -24,6 +24,7 @@ module _3gpp-common-managed-function { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2025-08-06 { reference CR-0550; } revision 2024-02-24 { reference CR-0346; } revision 2023-09-18 { reference CR-0271; } revision 2023-04-26 { reference CR-0250; } @@ -118,7 +119,7 @@ module _3gpp-common-managed-function { leaf administrativeState { type types3gpp:BasicAdministrativeState; - mandatory true; + default LOCKED; description "Permission to use or prohibition against using the instance"; } diff --git a/yang-models/_3gpp-common-managementdatacollection.yang b/yang-models/_3gpp-common-managementdatacollection.yang index 2a6ffea33c3fdca5069f640602c60f8443bc7bb7..654694558470b876b8c40e0e2c7528198656b22d 100644 --- a/yang-models/_3gpp-common-managementdatacollection.yang +++ b/yang-models/_3gpp-common-managementdatacollection.yang @@ -24,6 +24,7 @@ module _3gpp-common-managementdatacollection { Integration Reference Point (IRP); Information Service (IS)"; + revision 2025-02-05 { reference "CR-0460" ; } revision 2024-04-12 { reference CR-0346; } revision 2023-11-18 { reference CR-0299 ; } revision 2023-11-06 { reference "CR-0305"; } @@ -213,12 +214,7 @@ module _3gpp-common-managementdatacollection { The metrics are identified with their names/identifiers. For performance measurements defined in TS 28.552 the name is - constructed as follows: - - 'family.measurementName.subcounter' for measurement types with - subcounters - - 'family.measurementName' for measurement types without - subcounters - - 'family' for measurement families + constructed as the bullet e) of the measurement definition. For KPIs defined in TS 28.554 the name is defined according to the KPI definitions template as the component designated with a). diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index e2cf97b8a3e946cdd07ac0bab2727e1d71104a5c..31f7e901edc1fd9533023de9f319cce3e31c2080 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -43,8 +43,8 @@ module _3gpp-common-measurements { Measurements can be contained under ManagedElement, SubNetwork, or any list representing a class inheriting from Subnetwork or - ManagedFunction. Note: KPIs will only be supported under SubNetwork - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + ManagedFunction. + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -56,6 +56,11 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; + revision 2025-08-06 { reference CR-0550; } + revision 2025-05-18 { reference CR-0531; } + revision 2025-02-05 { reference CR-0460; } + revision 2025-01-28 { reference CR-0511; } + revision 2024-11-06 { reference CR-0487; } revision 2024-05-06 { reference CR-0359; } revision 2024-02-24 { reference CR-0346; } revision 2023-11-18 { reference "CR-0299 CR-0305"; } @@ -92,24 +97,13 @@ module _3gpp-common-measurements { by other SDOs, or be vendor specific. Performance metrics are identified with their names. - For measurements defined in TS 28.552 the name is constructed as follows: - - 'family.measurementName.subcounter' for measurement types with - subcounters - - 'family.measurementName' for measurement types without subcounters - `- 'family' for measurement families - For KPIs defined in TS 28.554 [28] the name is defined in the KPI - definitions template as the component designated with e). + For measurements defined in TS 28.552 the name is constructed as the + bullet e) of the measurement definition. A name can also identify a vendor specific performance metric or a group of vendor specific performance metrics."; } - leaf thresholdLevel { - type uint64; - mandatory true; - description "Number (key) for a single threshold in the threshold list - applicable to the monitored performance metric."; - } leaf thresholdDirection { type enumeration { @@ -187,6 +181,7 @@ module _3gpp-common-measurements { grouping SupportedPerfMetricGroupGrp { list SupportedPerfMetricGroups { config false; + key idx; description "Captures a group of supported performance metrics and associated parameters related to their production and reporting. A SupportedPerfMetricGroup attribute which is part of an MOI may @@ -195,6 +190,8 @@ module _3gpp-common-measurements { can specify supported metrics for contained ManagedFunctions like a GNBDUFunction."; + leaf idx { type uint32; } + leaf-list performanceMetrics { type string; min-elements 1; @@ -204,11 +201,7 @@ module _3gpp-common-measurements { Measurements are identified by name. For measurements defined in TS 28.552 the name is constructed as - follows: - - 'family.measurementName.subcounter' for measurement types with - subcounters - - 'family.measurementName' for measurement types without subcounters - - 'family' for measurement families + the bullet e) of the measurement definition. For KPIs defined in TS 28.554 the name is defined in the KPI definitions template as the component designated with e). @@ -247,10 +240,10 @@ module _3gpp-common-measurements { } grouping PerfMetricJobGrp { - description "Represents the attributtes of the IOC PerfMetricJob"; + description "Represents the attributes of the IOC PerfMetricJob"; leaf administrativeState { - default UNLOCKED; + default LOCKED; type types3gpp:BasicAdministrativeState ; description "Enable or disables production of the metrics"; } @@ -278,11 +271,7 @@ module _3gpp-common-measurements { identify a vendor specific group of performance metrics. For measurements defined in TS 28.552 the name is constructed as - follows: - - 'family.measurementName.subcounter' for measurement types with - subcounters - - 'family.measurementName' for measurement types without subcounters - - 'family' for measurement families + the bullet e) of the measurement definition. For KPIs defined in TS 28.554 the name is defined in the KPI definitions template as the component designated with e)."; @@ -345,7 +334,7 @@ module _3gpp-common-measurements { to monitor."; leaf administrativeState { - default UNLOCKED; + default LOCKED; type types3gpp:BasicAdministrativeState ; description "Enables or disables the ThresholdMonitor."; } diff --git a/yang-models/_3gpp-common-mecontext.yang b/yang-models/_3gpp-common-mecontext.yang new file mode 100644 index 0000000000000000000000000000000000000000..df9b7ef0d9edf9b86410c161f377398b3e67065a --- /dev/null +++ b/yang-models/_3gpp-common-mecontext.yang @@ -0,0 +1,86 @@ +module _3gpp-common-mecontext { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-common-mecontext"; + prefix "mectx3gpp"; + + import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-yang-extensions { prefix yext3gpp ; } + import _3gpp-common-top { prefix top3gpp; } + import _3gpp-common-subnetwork { prefix subnet3gpp; } + import ietf-yang-schema-mount { prefix yangmnt; } + + organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + + description "Defines basic MeContext which will be augmented by other IOCs + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.623 + Generic Network Resource Model (NRM) + Integration Reference Point (IRP); + Solution Set (SS) definitions + + 3GPP TS 28.622 + Generic Network Resource Model (NRM) + Integration Reference Point (IRP); + Information Service (IS)"; + + revision 2025-03-24 { reference "CR-0524"; } + revision 2025-03-24 { reference "CR-0517 CR-0516"; } + revision 2024-07-17 { reference "CR-0381 CR-0382 CR-0383"; } + + grouping MeContextGrp { + description "Represents the MeContext IOC."; + + leaf dnPrefix { + type types3gpp:DistinguishedName; + yext3gpp:inVariant; + description "It carries the DN Prefix information or no information. + The instance of MeContext is the local root instance of the MIB. + Otherwise the attribute shall be absent or carry no information."; + reference "Annex C of 32.300 "; + } + } + + augment "/subnet3gpp:SubNetwork" { + list MeContext { + description "This IOC is introduced for naming purposes. It may support + creation of unique DNs in scenarios when some MEs have the same RDNs due + to the fact that they have been manufacturer pre-configured. + + If some MEs have the same RDNs (for the above mentioned reason) and they + are contained in the same SubNetwork instance, some measure shall be + taken in order to assure the global uniqueness of DNs for all IOC + instances under those MEs. One way could be to set different dnPrefix + for those NEs, but that would require either that: + + a) all LDNs or DNs are locally modified using the new dnPrefix for the + upper portion of the DNs, or + b) a mapping (translation) of the old LDNs or DNs to the new DNs every + time they are used externally, e.g. in alarm notifications. + + As both the two alternatives above may involve unacceptable drawbacks + (as the old RDNs for the MEs then would have to be changed or mapped to + new values), using MeContext offers a new alternative to resolve the DN + creation. Using MeContext as part of the naming tree (and thus the DN) + means that the dnPrefix, including a unique MeContext for each ME, may + be directly concatenated with the LDNs, without any need to change or + map the existing ME RDNs to new values. + + MeContext have 0..N instances. It may exist even if no SubNetwork exists. + Every instance of MeContext contains exactly one ManagedElement during + steady-state operations."; + + key id; + uses top3gpp:Top_Grp; + container attributes { + uses MeContextGrp; + } + + yangmnt:mount-point children-of-MeContext { + description "Mountpoint for ManagedElement"; + reference "RFC8528 YANG Schema Mount"; + } + } + } +} \ No newline at end of file diff --git a/yang-models/_3gpp-common-qmcjob.yang b/yang-models/_3gpp-common-qmcjob.yang index bd46a03606da1467dab086579490ab72717290d9..c450b1cb16554759abd4c4bf9e6d69a522993aec 100644 --- a/yang-models/_3gpp-common-qmcjob.yang +++ b/yang-models/_3gpp-common-qmcjob.yang @@ -7,7 +7,6 @@ module _3gpp-common-qmcjob { import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } - import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-trace { prefix trace3gpp; } import ietf-inet-types { prefix inet; } @@ -27,6 +26,8 @@ module _3gpp-common-qmcjob { Integration Reference Point (IRP); Information Service (IS)"; + revision 2025-08-18 { reference CR-1557; } + revision 2024-11-05 { reference "CR-0470"; } revision 2023-09-18 { reference CR-0271 ; } revision 2023-02-14 { reference "CR-0234"; } revision 2022-11-04 { reference "CR-0215"; } @@ -49,12 +50,8 @@ module _3gpp-common-qmcjob { list areaScope { key "idx"; leaf idx { type uint32 ; } - description "It specifies the area where data shall be collected. - List of eNB/list of gNB/eNB/gNB for RLF or RCEF. - List of cells or Tracking Area for QMC. - Cell, TA, LA, RA are mutually exclusive."; - reference "Clause 5.10.2 of 3GPP TS 32.422"; - + description "It defines the area scope of QoE, which is specified + in clause 5.4 of TS 28.405."; uses trace3gpp:AreaScopeGrp; } @@ -114,7 +111,7 @@ module _3gpp-common-qmcjob { Assistance Information). A Network Slice end to end is identified by S-NSSAI."; key "sd sst"; - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } leaf qMCConfigFile { @@ -173,12 +170,15 @@ module _3gpp-common-qmcjob { producer. For details of Management Based Activation of QoE Measurement Collection see clause 4.5 and for details of Signalling Based Activation of QoE Measurement Collection see clause 4.6 of TS 28.405. - The attributes areaScope and pLMNTarget are only relevant when + The attribute pLMNTarget is only relevant when Management Based Activation is used and the attribute qoETarget is only relevant when Signalling Based Activation is used. All other attributes are common for both Management Based Activation and Signalling Based Activation. + The areaScope attribute defines the area scope of QoE, which is + specified in clause 5.4 of TS 28.405. + When a MnS consumer wishes to deactivate a QMC Job, the MnS consumer shall delete the corresponding QMCJob instance. NOTE: If the reporting is ongoing, when a request to delete a QMCJob @@ -189,43 +189,7 @@ module _3gpp-common-qmcjob { jobId can be used to associate multiple QMCJob instances. For example, it is possible to configure the same jobId value for multiple QMCJob instances required to produce the data (e.g. Streaming services and - MTSI reports) for a specific network analysis. - The QoE Measurement Collection provides capability for collecting QoE - information from: - - UEs which are in the specified area in case of Management Based - Activation or - - an individual UE in case of Signalling Based Activation. - The QoE Measurement Collection enables collection of application layer - from the UE for specified end user service type. The supported service - types are: - - Streaming services, see TS 26.247. - - MTSI services, see TS 26.114. - - VR services, see TS 26.118. - A QMCJob instance represents the job for collecting QoE measurements - according to the job parameters. For details of the QoE measurement - collection configuration parameters see clause 5 of TS 28.405. A QMCJob - instance can be name-contained by SubNetwork or ManagedElement. - A QMC Job is activated by creating a QMCJob object instance in the - MnS producer. For details of Management Based Activation of QoE - Measurement Collection see clause 4.5 and for details of Signalling - Based Activation of QoE Measurement Collection see - clause 4.6 of TS 28.405. The attributes areaScope and pLMNTarget are - only relevant when Management Based Activation is used and the - attribute qoETarget is only relevant when Signalling Based Activation - is used. All other attributes are common for both Management Based - Activation and Signalling Based Activation. - - When a MnS consumer wishes to deactivate a QMC Job, the MnS consumer - shall delete the corresponding QMCJob instance. - NOTE: If the reporting is ongoing, when a request to delete a QMCJob - instance is received, the reporting does not end. The QMCJob instance - is deleted, when the last reporting for the QMC Job expires. - - The jobId attribute presents the job identifier of a QMCJob instance. - The jobId can be used to associate multiple QMCJob instances. - example, it is possible to configure the same jobId value for multiple - QMCJob instances required to produce the data (e.g. Streaming services - and MTSI reports) for a specific network analysis."; + MTSI reports) for a specific network analysis."; key id; uses top3gpp:Top_Grp; container attributes { diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang index d6d5f7010369bea58396611428ff5c1ba8e16cca..e454361ba06d15fe8d7cf2da3db6fd16abc95455 100755 --- a/yang-models/_3gpp-common-subnetwork.yang +++ b/yang-models/_3gpp-common-subnetwork.yang @@ -4,6 +4,7 @@ module _3gpp-common-subnetwork { prefix "subnet3gpp"; import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-yang-extensions { prefix yext3gpp ; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-measurements { prefix meas3gpp; } import _3gpp-common-subscription-control { prefix subscr3gpp; } @@ -13,12 +14,13 @@ module _3gpp-common-subnetwork { import _3gpp-common-files { prefix files3gpp; } import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; } import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; } + import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines basic SubNetwork which will be augmented by other IOCs - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -33,6 +35,8 @@ module _3gpp-common-subnetwork { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2025-03-24 { reference "CR-0517 CR0526"; } + revision 2024-08-18 { reference CR-1336 ; } revision 2024-01-30 { reference CR-0328 ; } revision 2023-11-14 { reference CR-0305 ; } revision 2023-09-18 { reference CR-0271 ; } @@ -61,6 +65,10 @@ module _3gpp-common-subnetwork { reference "Initial revision"; } + feature ECMappingRuleUnderSubNetwork { + description "ECMappingRule shall be contained under SubNetwork."; + } + feature EcmConnectionInfoUnderSubNetwork { description "The EcmConnectionInfo shall be contained under Subnetwork"; @@ -146,6 +154,7 @@ module _3gpp-common-subnetwork { leaf dnPrefix { type types3gpp:DistinguishedName; + yext3gpp:inVariant; reference "Annex C of 32.300 "; } @@ -202,34 +211,13 @@ module _3gpp-common-subnetwork { list SubNetwork { key id; - description "Represents a set of managed entities"; + description "Represents a set of managed entities + Contained ManagedElements and SubNetworks shall be connected via + YANG Schema-mount."; uses top3gpp:Top_Grp; container attributes { uses SubNetworkGrp; - leaf-list parents { - description "Reference to all containg SubNetwork instances - in strict order from the root subnetwork down to the immediate - parent subnetwork. - If subnetworks form a containment hierarchy this is - modeled using references between the child SubNetwork and the parent - SubNetworks. - This reference MUST NOT be present for the top level SubNetwork and - MUST be present for other SubNetworks."; - type leafref { - path "../../../SubNetwork/id"; - } - } - - leaf-list containedChildren{ - description "Reference to all directly contained SubNetwork instances. - If subnetworks form a containment hierarchy this is - modeled using references between the child SubNetwork and the parent - SubNetwork."; - type leafref { - path "../../../SubNetwork/id"; - } - } } uses meas3gpp:MeasurementSubtree { @@ -265,10 +253,14 @@ module _3gpp-common-subnetwork { } yangmnt:mount-point children-of-SubNetwork { - description "Mountpoint for ManagedElement"; + description "Mountpoint for contained ManagedElements and SubNetworks"; reference "RFC8528 YANG Schema Mount"; } + uses ecmap3gpp:NRECMappingRuleSubtree { + if-feature EcmConnectionInfoUnderSubNetwork; + } + // augment external parts here } -} \ No newline at end of file +} diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang index b637e1ff53c5de712befab920a09e955a26b5ed7..1fd0ec8c38b8933b959a239e699eeb27dd352cd3 100755 --- a/yang-models/_3gpp-common-subscription-control.yang +++ b/yang-models/_3gpp-common-subscription-control.yang @@ -5,12 +5,13 @@ module _3gpp-common-subscription-control { import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } - + import ietf-yang-types { prefix yang; } + organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines IOCs for subscription and heartbeat control. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -18,6 +19,8 @@ module _3gpp-common-subscription-control { Solution Set (SS) definitions 3GPP TS 28.623"; + revision 2025-11-06 { reference CR-0585 ; } + revision 2025-03-30 { reference CR-0517 ; } revision 2024-05-18 { reference CR-0359 ; } revision 2024-01-18 { reference "CR-0309 CR-0329" ; } revision 2023-09-18 { reference CR-0271 ; } @@ -84,11 +87,26 @@ module _3gpp-common-subscription-control { } } case dataNodeSelector { - leaf dataNodeSelector { - type string; + container dataNodeSelector { description "The value shall follow the rules of RFC 8641 filter-spec"; - reference "RFC 8641 section 5."; + reference "RFC 8641 section 5. and ietf-yang-push.yang"; + choice dataNodeSelector { + anydata datastore-subtree-filter { + description "Subtree filter"; + reference + "RFC 6241: Network Configuration Protocol (NETCONF), Section 6"; + } + leaf datastore-xpath-filter { + type yang:xpath1.0; + description "XPath-filter"; + reference + "XML Path Language (XPath) Version 1.0 + (https://www.w3.org/TR/1999/REC-xpath-19991116) + RFC 7950: The YANG 1.1 Data Modeling Language, + Section 10"; + } + } } } } @@ -114,8 +132,8 @@ module _3gpp-common-subscription-control { list scope { description "Scopes (selects) data nodes in an object tree."; key idx; - max-elements 8; - leaf idx { type string; } + max-elements 1; + leaf idx { type uint32; } uses ScopeGrp; } diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index af5327945e8450ecca88f1883152f8593ac64667..55db59b19b6c9d2b3873a1e275a96f3f4eddc9ee 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -13,7 +13,7 @@ module _3gpp-common-trace { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Trace handling - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -25,6 +25,14 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; + revision 2025-08-06 { reference CR-0563; } + revision 2025-06-24 { reference "CR-0550"; } + revision 2025-05-06 { reference "CR-0531 CR-0535" ; } + revision 2025-02-06 { reference "CR-0503 CR-0507" ; } + revision 2025-02-05 { reference "CR-0460" ; } + revision 2024-11-05 { reference "CR-0470" ; } + revision 2024-10-06 { reference "CR-0459"; } + revision 2024-08-06 { reference "CR-0376 CR-0378 CR-0420"; } revision 2024-05-12 { reference "CR-0401"; } revision 2024-05-06 { reference CR-0359; } revision 2024-04-06 { reference "CR-0342"; } @@ -105,62 +113,61 @@ module _3gpp-common-trace { grouping AreaScopeGrp { description "Represents the AreaScope dataType. - This <> defines the area scope of MDT. - The Area Scope parameter in LTE and NR is either: - - list of Cells, identified by E-UTRAN-CGI or NG-RAN CGI. - Maximum 32 CGI can be defined. - - list of Tracking Area, identified by TAC. - Maximum of 8 TAC can be defined. - - list of Tracking Area Identity, identified by TAC with - associated plmn-Identity perTAC-List containing the - PLMN identity for each TAC. Maximum of 8 TAI can be defined. - The Area Scope parameter in NR can also contain: - - list of NPN-IDs in NR. It is either a list of PNI-NPNs - identified by CAG ID with associated plmn-Identity or a - list of SNPNs identified by Network ID with associated - plmn-Identity ."; + This <> defines an area scope"; choice AreaScopeChoice { - leaf-list eutraCellIdList { - type string; - min-elements 1; - max-elements 32; - description "List of E-UTRAN cells identified by E-UTRAN-CGI"; - } - - leaf-list utraCellIdList { - type string; - min-elements 1; - max-elements 32; - description "List of UTRAN cells identified by UTRAN CGI"; - } - - leaf-list tacList { - type types3gpp:Tac; - min-elements 1; - max-elements 8; - description "Tracking Area Code list"; + case eutran-only { + leaf-list eutraCellIdList { + type string; + min-elements 1; + max-elements 32; + description "List of E-UTRAN cells identified by E-UTRAN-CGI"; + } + } + case tac { + leaf-list tacList { + type types3gpp:Tac; + min-elements 1; + max-elements 8; + description "Tracking Area Code list"; + } + leaf-list cAGIdList { + type string; + max-elements 256; + description "It identifies a CAG list containing up to + 256 CAG-identifiers per UE or up to 12 CAG-identifiers + per cell, see TS 38.331 [38]. CAG ID is used to combine + with PLMN ID to identify a PNI-NPN.AG ID is a hexadecimal + range with size 32 bit."; + } } - - list taiList { - description "Tracking Area Identity list"; - key idx; - min-elements 1; - max-elements 8; - leaf idx { type string; } - uses types3gpp:TaiGrp; + case else { + list nPNIdentityList { + description "list of NPN IDs of in NR. It is either + a list of PNI-NPNs identified by CAG ID with + associated plmn-Identity or a list of SNPN + identified by Network ID with associated plmn-Identity"; + key idx; + min-elements 1; + uses types3gpp:NpnIdGrp; + leaf idx { type string; } + } + leaf-list nrCellIdList { + must 'not(../taiList)'; + type string; + max-elements 32; + description "List of NR cells identified by NG-RAN CGI"; + } + list taiList { + must 'not(../nrCellIdList)'; + description "Tracking Area Identity list"; + key idx; + max-elements 8; + leaf idx { type string; } + uses types3gpp:TaiGrp; + } } } - - list nPNIdentityList { - description "list of NPN IDs of in NR. It is either a list of PNI-NPNs - identified by CAG ID with associated plmn-Identity or a list of SNPN - identified by Network ID with associated plmn-Identity"; - key idx; - min-elements 1; - uses NpnIdGrp; - leaf idx { type string; } - } } grouping NpnIdGrp { @@ -173,18 +180,25 @@ module _3gpp-common-trace { max-elements 1; } - list cAGIdList { - key idx; + choice npnidChoice { + leaf-list cAGIdList { + type string; max-elements 256; - description "It specifies the PNI-NPN identified by CAG ID "; - leaf idx { type string; } + description "It identifies a CAG list containing up to 256 + CAG-identifiers per UE or up to 12 CAG-identifiers per cell, + see TS 38.331. + CAG ID is used to combine with PLMN ID to identify a PNI-NPN. + CAG ID is a hexadecimal range with size 32 bit."; } - list nIDList { - key idx; + leaf-list nIDList { + type string; max-elements 16; - description "It specifies the SNPN identified by Network ID"; - leaf idx { type string; } + description "It identifies a list of NIDs containing up to 16 NIDs, + see TS 38.331. + NID is used to combine with PLMN ID to identify an SNPN. + NID is a hexadecimal range with size 44 bit."; + } } } @@ -224,10 +238,13 @@ module _3gpp-common-trace { uses types3gpp:PLMNId; // mcc+mnc leaf traceId { - type string; + type string { + pattern "[0-9a-fA-F]{6}"; + } mandatory true; description "An identifier, which identifies the Trace - (together with MCC and MNC). This is a 3 byte Octet String."; + (together with MCC and MNC). This is a 3 byte Octet String, + expressed in hexadecimal form e.g., '1a7b3d')."; } } @@ -263,7 +280,7 @@ module _3gpp-common-trace { The attribute traceDepth allows to configure the level of detail of the information which shall be recorded. For trace the reporting is event based, where the triggering event is configured with - attribute triggeringEvent. For each triggering event the first and + attribute triggeringEvents. For each triggering event the first and last message (start/stop triggering event) to record are specified."; list listOfInterfaces { @@ -569,7 +586,7 @@ module _3gpp-common-trace { } } - leaf-list listOfNETypes { + leaf-list listOfNeTypes { type enumeration { enum MSC_SERVER; enum SGSN; @@ -586,12 +603,10 @@ module _3gpp-common-trace { enum GNB_CU_UP; enum GNB_DU; } - description "Specifies in which type of ManagedFunction the trace should + description "Specifies the network element types where the trace should be activated. The attribute is applicable only for Trace with - Signalling Based Trace activation. In case this attribute is not used, - it carries a null semantic"; - reference "Clause 5.4 of 3GPP TS 32.422 for additional details on the - allowed values"; + Signalling Based Trace activation. "; + reference "Clause 5.4 of 3GPP TS 32.422."; } leaf traceDepth { @@ -606,71 +621,177 @@ module _3gpp-common-trace { enum VENDORMAXIMUM; } default MAXIMUM; - description "Specifies how detailed information should be recorded in the - Network Element. The Trace Depth is a paremeter for Trace Session level, - i.e., the Trace Depth is the same for all of the NEs to be traced in - the same Trace Session. - The attribute is applicable only for Trace, otherwise it carries a null - semantic."; - reference "Clause 5.3 of 3GPP TS 32.422"; + description "It specifies the trace depth. The attribute is + applicable only for Trace."; + reference "Clause 5.3 of 3GPP TS 32.422."; } - leaf triggeringEvents { - type enumeration { - enum MO_MT_CALLS; - enum MO_MT_SMS; - enum LU_IMSIattach_IMSIdetach; - enum HANDOVER; - enum SS; - enum PDPcontext; - enum RAU_GPRSattach_GPRSdetach; - enum MBMScontext; - enum CONTEXT; - enum SIPsession_StandaloneTransaction; - enum MBMSactivation; - enum UEinitiatedPDNconnectivityRequest; - enum ServiceRequest; - enum InitialAttach_TAU_Detach; - enum UEinitiatedPDNdisconnection; - enum BearerActivationModificationDeletion; - enum Handover; - enum PDNconnectionCreation; - enum PDNconnectionTermination; - enum Registration; - enum UEderegistration; - enum NetworkDeregistration; - enum UEMobilityFromEPC; - enum UEMobilityToEPC; - enum PDUsessionEstablishment; - enum PDUsessionModification; - enum PDUsessionRelease; - enum PDUsessionUPactivationDeactivation; - enum MobilityBtw3gppAndN3gppTo5GC; - enum MobilityFromEpc; - enum AMpolicy; - enum SMpolicy; - enum Authorization; - enum BDTpolicy; - enum N4Session; - enum UEauthentication; - enum EventExposure; - enum PFDmanagement; - enum ParameterProvision; - enum Trigger; - enum NFmanagement; - enum NFdiscovery; - enum NSSelection; - enum NSSAI; - enum SMservice; - enum UEcontext; - enum SubscriberData; - } + list triggeringEvents { + key idx; description "It specifies the triggering event parameter of the trace - session. The attribute is applicable only for Trace. In case this - attribute is not used, it carries a null semantic. + session. The attribute is applicable only for Trace."; + reference "Clause 5.1 of 3GPP TS 32.422"; + leaf idx { type uint32; } + max-elements 1; - See the clause 5.1 of 3GPP TS 32.422 for additional details on the - allowed values."; + leaf-list MSC_SERVER { + type enumeration { + enum MO_MT_CALLS; + enum MO_MT_SMS; + enum LU_IMSIattach_IMSIdetach; + enum SS; + } + } + + leaf-list SGSN { + type enumeration { + enum PDPcontext; + enum MO_MT_SMS; + enum RAU_GPRSattach_GPRSdetach; + enum MBMScontext; + } + } + + + leaf-list MGW { + type enumeration { + enum CONTEXT; + } + } + + leaf-list GGSN { + type enumeration { + enum PDPcontext; + enum MBMScontext; + } + } + + leaf-list IMS { + type enumeration { + enum SIPsession_StandaloenTransaction; + } + } + + leaf-list BM_SC { + type enumeration { + enum MBMSactivation; + } + } + + leaf-list MME { + type enumeration { + enum UEinitiatedPDNconnectivityRequest; + enum ServiceRequest; + enum InitialAttach_TAU_Detach; + enum UEInitiatedPDNdisconnection; + enum BearerActivationModificationDeletion; + enum Handover; + } + } + + + leaf-list SGW { + type enumeration { + enum PDNconnectionCreation; + enum PDNconnectionTermination; + enum BearerActivationModificationDeletion; + } + } + + leaf-list PGW { + type enumeration { + enum PDNconnectionCreation; + enum PDNconnectionTermination; + enum BearerActivationModificationDeletion; + } + } + + leaf-list AMF { + type enumeration { + enum Registration; + enum ServiceRequest; + enum Handover; + enum UEderegistration; + enum NetworkDeregistration; + enum UEMobilityFromEPC; + enum UEMobilityToEPC; + enum CovergedChargingService; + } + } + + leaf-list SMF { + type enumeration { + enum PDUsessionEstablishment; + enum PDUsessionModification; + enum PDUsessionRelease; + enum PDUsessionUPactivationDeactivation; + enum MobilityBtw3gppAndN3gppTo5GC; + enum MobilityFromEpc; + enum MobilityBtwISMForVSMF; + enum CovergedChargingService; + enum OfflineOnlyCharging; + } + } + + leaf-list PCF { + type enumeration { + enum AMpolicy; + enum SMpolicy; + enum Authorization; + enum BDTpolicy; + enum SpendingLimitControl; + } + } + + leaf-list UPF { + type enumeration { + enum N4Session; + } + } + + leaf-list AUSF { + type enumeration { + enum UEauthentication; + } + } + + leaf-list NEF { + type enumeration { + enum EventExposure; + enum PFDmanagement; + enum ParameterProvisiong; + enum Trigger; + } + } + + leaf-list NRF { + type enumeration { + enum NFmanagement; + enum NFdiscovery; + } + } + + leaf-list NSSF { + type enumeration { + enum NSSelection; + enum NSSAI; + } + } + + leaf-list SMSF { + type enumeration { + enum SMService; + } + } + + leaf-list UDM { + type enumeration { + enum UEcontext; + enum SubscriberData; + enum UEauthentication; + enum EventExposure; + } + } } } @@ -685,20 +806,30 @@ module _3gpp-common-trace { The following attributes are conditional available based on the measurements configured in listOfMeasurements: - -reportInterval: conditional for M1 in LTE or NR and M1/M2 in UMTS, - -reportAmount: conditional for M1 in LTE or NR and M1/M2 in UMTS, - -reportingTrigger: conditional for M1 in LTE or NR and M1/M2 in UMTS, - -eventThreshold: conditional for A2 event reporting or A2 event - triggered periodic reporting, - -collectionPeriodRrmNR: conditional for M4 and M5 in NR, - -collectionPeriodM6NR: conditional for M6 in NR, - -collectionPeriodM7NR: conditional for M7 in NR, - -collectionPeriodRrmLte (conditional for M3 in LTE), + -reportInterval (conditional for M1 in LTE or NR and M1/M2 in UMTS), + -reportAmount (conditional for M1/M2 in UMTS), + -reportAmountM1LTE (conditional for M1 in LTE), + -reportAmountM4LTE (conditional for M4 in LTE), + -reportAmountM5LTE (conditional for M5 in LTE), + -reportAmountM6LTE (conditional for M6 in LTE), + -reportAmountM7LTE (conditional for M7 in LTE), + -reportAmountM1NR (conditional for M1 in NR), + -reportAmountM4NR (conditional for M4 in NR), + -reportAmountM5NR (conditional for M5 in NR), + -reportAmountM6NR (conditional for M6 in NR), + -reportAmountM7NR (conditional for M7 in NR), + -reportingTrigger (conditional for M1 in LTE or NR and M1/M2 in UMTS), + -eventThreshold (conditional for A2 event reporting or A2 event + triggered periodic reporting), + -collectionPeriodRRMNR (conditional for M4 and M5 in NR), + -collectionPeriodM6NR (conditional for M6 in NR), + -collectionPeriodM7NR (conditional for M7 in NR), + -collectionPeriodRRMLTE (conditional for M3 in LTE), -measurementPeriodLTE (conditional for M4 and M5 in LTE), - -collectionPeriodM6Lte (conditional for M6 in LTE), - -collectionPeriodM7Lte (conditional for M7 in LTE), - -collectionPeriodRrmUmts (conditional for M4 and M5 in UMTS), - -measurementPeriodUmts (conditional for M6 and M7 in UMTS), + -collectionPeriodM6LTE (conditional for M6 in LTE), + -collectionPeriodM7LTE (conditional for M7 in LTE), + -collectionPeriodRRMUMTS (conditional for M4 and M5 in UMTS), + -measurementPeriodUMTS (conditional for M6 and M7 in UMTS), -measurementQuantity (conditional for 1F event reporting), -beamLevelMeasurement (conditional for M1 in NR), -excessPacketDelayThresholds (conditional for M6 UL measurement in NR). @@ -734,10 +865,11 @@ module _3gpp-common-trace { - For measurement M2 in LTE or NR, reporting is according to RRM configuration, see TS 38.321, TS 36.321 and TS 38.331, TS 36.331. - For measurement M4 in UMTS, reporting is either according to RRM + + - For measurement M4 in UMTS, reporting is either according to RRM configuration, see TS 25.321 and TS 25.331 or periodic or event - triggered periodic using parameter collectionPeriodRrmUmts and - eventThresholdUphUmts. + triggered periodic using parameter collectionPeriodRRMUMTS and + eventThresholdUphUMTS. - For measurement M3 in UMTS, the reporting is done upon availability, see TS 37.320. @@ -746,11 +878,18 @@ module _3gpp-common-trace { M3, M4, M5, M6 and M7 in LTE and for measurements M5, M6 and M7 in UMTS periodical reporting is applied. The configurable parameter is the interval between two measurements (collectionPeriodRrmNr, - collectionPeriodM6NR, collectionPeriodM7Nr, collectionPeriodRrmLte, - measurementPeriodLte, collectionPeriodM6Lte, collectionPeriodM7Lte, - collectionPeriodRrmUmts, measurementPeriodUmts). If no collection - period is configured for M5 in UMTS, all available measurements are - logged according to RRM configuration."; + collectionPeriodM6NR, collectionPeriodM7NR, collectionPeriodRRMLTE, + measurementPeriodLte, collectionPeriodM6LTE, collectionPeriodM7LTE, + collectionPeriodRRMUMTS, measurementPeriodUMTS) and the number of + reports (reportAmountM4NR, reportAmountM5NR, reportAmountM6NR, + reportAmountM7NR, reportAmountM4LTE, reportAmountM5LTE, + reportAmountM6LTE, reportAmountM7LTE). If no collection + period is configured for M5 in UMTS, all available measurements + ar elogged according to RRM configuration. + + - Measurements M8 and M9 in NR or LTE are reported according to + configured M1 and/or M6 related UE measurement reporting. + "; leaf listOfMeasurements { when '../../../jobType = "IMMEDIATE_MDT_ONLY"'; @@ -770,10 +909,10 @@ module _3gpp-common-trace { enum M8; enum M9; } - description "It specifies the UE measurements that shall be collected in - an Immediate MDT job. The attribute is applicable only for Immediate MDT. - In case this attribute is not used, it carries a null semantic."; - reference "3GPP TS 32.422 clause 5.10.3"; + description "It specifies the UE measurements that shall be + collected in an Immediate MDT job. The attribute is + applicable only for Immediate MDT."; + reference "Clause 5.10.3 of 3GPP TS 32.422."; } leaf reportingTrigger { @@ -787,13 +926,12 @@ module _3gpp-common-trace { enum ALL_CONFIGURED_RRM_FOR_LTE; enum ALL_CONFIGURED_RRM_FOR_UMTS; } - description "It specifies whether periodic or event based measurements - should be collected. + description "It specifies whether periodic or event based + measurements should be collected. The attribute is applicable only for Immediate MDT and when the listOfMeasurements is configured for M1 (for both UMTS and LTE) - or M2 (only for UMTS). In case this attribute is not used, it carries - a null semantic."; - reference "Clause 5.10.4 of 3GPP TS 32.422"; + or M2 (only for UMTS)."; + reference "Clause 5.10.4 of 3GPP TS 32.422."; } leaf reportInterval { @@ -809,9 +947,8 @@ module _3gpp-common-trace { description "It specifies the interval between the periodical measurements that shall be taken when the UE is in connected mode. The attribute is applicable only for Immediate MDT and when - reportingTrigger is configured for periodical measurements. In case - this attribute is not used, it carries a null semantic."; - reference "5.10.5 of 3GPP TS 32.422"; + reportingTrigger is configured for periodical measurements."; + reference "Clause 5.10.5 of 3GPP TS 32.422."; } leaf reportAmount { @@ -828,9 +965,8 @@ module _3gpp-common-trace { description "It specifies the number of measurement reports that shall be taken for periodic reporting while the UE is in connected. The attribute is applicable only for Immediate MDT and when - reportingTrigger is configured for periodical measurements. In - case this attribute is not used, it carries a null semantic."; - reference "Clause 5.10.6 of 3GPP TS 32.422"; + reportingTrigger is configured for periodical measurements."; + reference "Clause 5.10.6 of 3GPP TS 32.422."; } leaf eventThreshold { @@ -839,12 +975,11 @@ module _3gpp-common-trace { description "Specifies the threshold which should trigger the reporting in case A2 event reporting in LTE or 1F/1l event in UMTS. The attribute is applicable only for Immediate MDT and when reportingTrigger is - configured for A2 event in LTE or 1F event or 1l event in UMTS. In - case this attribute is not used, it carries a null semantic."; - reference "Clauses 5.10.7 and 5.10.7a of 3GPP TS 32.422"; + configured for A2 event in LTE or 1F event or 1l event in UMTS."; + reference "Clauses 5.10.7 and 5.10.7a of 3GPP TS 32.422."; } - leaf collectionPeriodRrmNr { + leaf collectionPeriodRRMNR { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { @@ -853,12 +988,11 @@ module _3gpp-common-trace { units milliseconds; description "Specifies the collection period for collecting RRM configured measurement samples for M4, M5 in NR. The attribute is - applicable only for Immediate MDT. In case this attribute is not - used, it carries a null semantic."; - reference "Clause 5.10.30 of 3GPP TS 32.422"; + applicable only for Immediate MDT."; + reference "Clause 5.10.30 of 3GPP TS 32.422."; } - leaf collectionPeriodM6Nr { + leaf collectionPeriodM6NR { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type enumeration { @@ -879,12 +1013,11 @@ module _3gpp-common-trace { } description "It specifies the collection period for the Packet Delay measurement (M6) for NR MDT taken by the gNB. The attribute is - applicable only for Immediate MDT. In case this attribute is not used, - it carries a null semantic."; - reference "clause 5.10.34 of TS 32.422"; + applicable only for Immediate MDT."; + reference "clause 5.10.34 of TS 32.422."; } - leaf collectionPeriodM7Nr { + leaf collectionPeriodM7NR { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { @@ -892,43 +1025,50 @@ module _3gpp-common-trace { } description "It specifies the collection period for the Packet Loss Rate measurement (M7) for NR MDT taken by the gNB. The attribute is - applicable only for Immediate MDT. In case this attribute is not used, - it carries a null semantic."; - reference "clause 5.10.35 of TS 32.422"; + applicable only for Immediate MDT. "; + reference "clause 5.10.35 of TS 32.422."; } - leaf collectionPeriodRrmLte { + leaf collectionPeriodRRMLTE { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; - type uint32 { - range "250|500|1000|2000|3000|4000|6000|8000|12000|16000|20000|" - +"24000|28000|32000|64000"; + type enumeration { + enum 100ms; + enum 1000ms; + enum 1024ms; + enum 1280ms; + enum 2048ms; + enum 2560ms; + enum 5120ms; + enum 10000ms; + enum 10240ms; + enum 1min; } - units milliseconds; description "Specifies the collection period for collecting RRM configured - measurement samples for M2, M3 in LTE. The attribute is applicable only - for Immediate MDT. In case this attribute is not used, it carries a - null semantic."; - reference "Clause 5.10.20 of 3GPP TS 32.422"; + measurement samples for M3 in LTE. The attribute is applicable only + for Immediate MDT."; + reference "Clause 5.10.20 of 3GPP TS 32.422."; } leaf measurementPeriodLTE { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; - type uint32 { - range "1024|1280|2048|2560|5120|" - +"10240|60000"; + type enumeration { + enum 1024ms; + enum 2048ms; + enum 5120ms; + enum 10240ms; + enum 1min; } - units milliseconds; mandatory true; - description "It specifies the measurement period for the Data Volume and - Scheduled IP throughput measurements for MDT taken by the eNB. - The attribute is applicable only for Immediate MDT. In case this - attribute is not used, it carries a null semantic."; - reference "Clause 5.10.23 of 3GPP TS 32.422"; + description "It specifies the measurement period for the + Data Volume (M4) and Scheduled IP throughput measurements + (M5) for LTE MDT taken by the eNB. The attribute is + applicable only for Immediate MDT."; + reference "Clause 5.10.23 of 3GPP TS 32.422."; } - leaf collectionPeriodM6Lte { + leaf collectionPeriodM6LTE { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { @@ -937,12 +1077,11 @@ module _3gpp-common-trace { units milliseconds; description "Specifies the collection period for the Packet Delay measurement (M6) for MDT taken by the eNB. The attribute is applicable - only for Immediate MDT. In case this attribute is not used, - it carries a null semantic."; - reference "Clause 5.10.32 of TS 32.422 "; + only for Immediate MDT."; + reference "Clause 5.10.32 of TS 32.422."; } - leaf collectionPeriodM7Lte { + leaf collectionPeriodM7LTE { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint16 { @@ -950,12 +1089,11 @@ module _3gpp-common-trace { } description "It specifies the collection period for the Packet Loss Rate measurement (M7) for LTE MDT taken by the eNB. The attribute is - applicable only for Immediate MDT. In case this attribute - is not used, it carries a null semantic."; - reference "Clause 5.10.33 of TS 32.422 ."; + applicable only for Immediate MDT."; + reference "Clause 5.10.33 of TS 32.422."; } - leaf eventThresholdUphUmts { + leaf eventThresholdUphUMTS { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint16 { @@ -963,40 +1101,36 @@ module _3gpp-common-trace { } description "It specifies the threshold which should trigger the reporting in case of event-triggered periodic reporting for M4 - (UE power headroom measurement) in UMTS. In case this attribute is - not used, it carries a null semantic."; - reference "5.10.39 of TS 32.422"; + (UE power headroom measurement) in UMTS."; + reference "Clause 5.10.39 of TS 32.422."; } - leaf collectionPeriodRrmUmts { + leaf collectionPeriodRRMUMTS { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { - range "1024|1280|2048|2560|5120|" - +"10240|60000"; + range "100|250|500|1000|2000|" + +"3000|4000|6000"; } units milliseconds; description "Specifies the collection period for collecting RRM configured measurement samples for M3, M4, M5 in UMTS. The attribute is applicable - only for Immediate MDT. In case this attribute is not used, it carries - a null semantic"; - reference "Clause 5.10.21 of 3GPP TS 32.422"; + only for Immediate MDT."; + reference "Clause 5.10.21 of 3GPP TS 32.422."; } - leaf measurementPeriodUmts { + leaf measurementPeriodUMTS { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + 'or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { - range "250|500|1000|2000|3000|4000|6000|8000|12000|16000|20000|" + range "1000|2000|3000|4000|6000|8000|12000|16000|20000|" +"24000|28000|32000|64000"; } units milliseconds; - mandatory true; description "It specifies the measurement period for the Data Volume and Throughput measurements for MDT taken by RNC. - The attribute is applicable only for Immediate MDT. In case this - attribute is not used, it carries a null semantic."; - reference "Clause 5.10.22 of 3GPP TS 32.422"; + The attribute is applicable only for Immediate MDT."; + reference "Clause 5.10.22 of 3GPP TS 32.422."; } leaf measurementQuantity { @@ -1009,7 +1143,7 @@ module _3gpp-common-trace { } description "It specifies the measurements that are collected in an MDT job for a UMTS MDT configured for event triggered reporting."; - reference "Clause 5.10.15 of 3GPP TS 32.422"; + reference "Clause 5.10.15 of 3GPP TS 32.422."; } leaf beamLevelMeasurement { @@ -1019,7 +1153,7 @@ module _3gpp-common-trace { default false; description "Indicates whether the NR M1 beam level measurements shall be included or not."; - reference "Clause 5.10.40 of TS 32.422"; + reference "Clause 5.10.40 of TS 32.422."; } leaf positioningMethod { @@ -1031,7 +1165,7 @@ module _3gpp-common-trace { } description "It specifies what positioning method should be used in the MDT job."; - reference "Clause 5.10.19 of 3GPP TS 32.422"; + reference "Clause 5.10.19 of 3GPP TS 32.422."; } list excessPacketDelayThresholds { @@ -1057,10 +1191,8 @@ module _3gpp-common-trace { taken for periodic reporting while the UE is in connected mode. The attribute is applicable only for Immediate MDT and combined Trace and Immediate MDT and when reportingTrigger is configured for periodical - measurements and applicable only for LTE. In case this attribute is not - used, it carries a null semantic. - See the clause 5.10.6 of TS 32.422 for additional details on the - allowed values."; + measurements and applicable only for LTE."; + reference "Clause 5.10.6 of TS 32.422."; } leaf reportAmountM4LTE { @@ -1075,13 +1207,11 @@ module _3gpp-common-trace { enum INFINITY; } description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical - measurements and applicable only for LTE. In case this attribute is not - used, it carries a null semantic. - See the clause 5.10.6 of TS 32.422 for additional details on the - allowed values."; + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for LTE."; + reference "Clause 5.10.6 of TS 32.422."; } leaf reportAmountM5LTE { @@ -1096,13 +1226,11 @@ module _3gpp-common-trace { enum INFINITY; } description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical - measurements and applicable only for LTE. In case this attribute is not - used, it carries a null semantic. - See the clause 5.10.6 of TS 32.422 for additional details on the - allowed values."; + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for LTE."; + reference "Clause 5.10.6 of TS 32.422."; } leaf reportAmountM6LTE { @@ -1117,13 +1245,11 @@ module _3gpp-common-trace { enum INFINITY; } description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical - measurements and applicable only for LTE. In case this attribute is not - used, it carries a null semantic. - See the clause 5.10.6 of TS 32.422 for additional details on the - allowed values."; + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for LTE."; + reference "Clause 5.10.6 of TS 32.422."; } leaf reportAmountM7LTE { @@ -1138,13 +1264,11 @@ module _3gpp-common-trace { enum INFINITY; } description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical - measurements and applicable only for LTE. In case this attribute is not - used, it carries a null semantic. - See the clause 5.10.6 of TS 32.422 for additional details on the - allowed values."; + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for LTE."; + reference "Clause 5.10.6 of TS 32.422."; } leaf reportAmountM1NR { @@ -1159,13 +1283,11 @@ module _3gpp-common-trace { enum INFINITY; } description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical - measurements and applicable only for NR. In case this attribute is not - used, it carries a null semantic. - See the clause 5.10.6 of TS 32.422 for additional details on the - allowed values."; + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for NR."; + reference "Clause 5.10.6 of TS 32.422."; } leaf reportAmountM4NR { @@ -1180,13 +1302,11 @@ module _3gpp-common-trace { enum INFINITY; } description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical - measurements and applicable only for NR. In case this attribute is not - used, it carries a null semantic. - See the clause 5.10.6 of TS 32.422 for additional details on the - allowed values."; + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for NR."; + reference "Clause 5.10.6 of TS 32.422."; } leaf reportAmountM5NR { @@ -1201,13 +1321,11 @@ module _3gpp-common-trace { enum INFINITY; } description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical - measurements and applicable only for NR. In case this attribute is not - used, it carries a null semantic. - See the clause 5.10.6 of TS 32.422 for additional details on the - allowed values."; + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for NR."; + reference "Clause 5.10.6 of TS 32.422."; } leaf reportAmountM6NR { @@ -1222,13 +1340,11 @@ module _3gpp-common-trace { enum INFINITY; } description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical - measurements and applicable only for NR. In case this attribute is not - used, it carries a null semantic. - See the clause 5.10.6 of TS 32.422 for additional details on the - allowed values."; + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for NR."; + reference "Clause 5.10.6 of TS 32.422."; } leaf reportAmountM7NR { @@ -1243,48 +1359,57 @@ module _3gpp-common-trace { enum INFINITY; } description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical - measurements and applicable only for NR. In case this attribute is not - used, it carries a null semantic. - See the clause 5.10.6 of TS 32.422 for additional details on the - allowed values."; + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for NR."; + reference "Clause 5.10.6 of TS 32.422."; } } grouping LoggedMdtConfigGrp { description "This <> defines the configuration parameters of - IOC TraceJob which are specific for Logged MDT or Logged MBSFN MDT. - The optional attribute plmnList allows to specify the PLMNs where - measurement collection, status indication and log reporting is allowed, - the optional attribute areaConfigurationForNeighCell allows to specify - the area for which UE is requested to perform measurements logging for - neighbour cells which have list of frequencies. For logged MDT in UMTS - and LTE, the reporting is periodical. Parameter loggingInterval determines - the interval between the reports and parameter loggingDuration determines - how long the configuration is valid meaning after this duration has passed - no further reports are sent. In NR, the reporting can be periodical or event - based, determined by parameter reportType. For periodical reporting the - same parameters as in LTE and UMTS apply. For event based reporting, - parameter eventListForEventTriggeredMeasurement configures the event type, - namely 'out of coverage' or 'L1 event'. In case 'L1 event' is selected as - event type, the logging is performed according to parameter loggingInterval - at regular intervals only when the conditions indicated by eventThresholdL1, - hysteresisL1, timeToTriggerL1 (defining the thresholds, hysteresis and time - to trigger) are met and if UE is 'camped normally' state (TS 38.331, - TS 38.304). In case 'out of coverage' is selected as event type, the - logging is performed according to parameter loggingInterval at regular - intervals only when the UE is in 'any cell selection' state. - Furthermore, logging is performed immediately upon transition from the - 'any cell selection' state to the 'camped normally' state (TS 38.331, - TS 38.304)."; + IOC TraceJob which are specific for Logged MDT or Logged MBSFN MDT. + + Based on the value configured for attribute jobType in IOC TraceJob, + different attributes are available. In case of LOGGED_MDT_ONLY, the + attributes reportType, eventListForEventTriggeredMeasurement, + eventThresholdL1, hysteresisL1, timeToTriggerL1, + areaConfigurationForNeighCells + and npnIdentityList are applicable. In case of LOGGED_MBSFN_MDT, + the attribute mbsfnAreaList is applicable. + The optional attribute plmnList allows to specify the PLMNs where + measurement collection, status indication and log reporting is allowed, + the optional attribute areaConfigurationForNeighCell allows to specify + the area for which UE is requested to perform measurements logging for + neighbour cells which have list of frequencies. For logged MDT in UMTS + and LTE, the reporting is periodical. Parameter loggingInterval + determines the interval between the reports and parameter + loggingDuration determines how long the configuration is valid + meaning after this duration has passed no further reports are sent. + In NR, the reporting can be periodical or event + based, determined by parameter reportType. For periodical reporting the + same parameters as in LTE and UMTS apply. For event based reporting, + parameter eventListForEventTriggeredMeasurement configures the event + type, namely 'out of coverage' or 'L1 event'. In case 'L1 event' is + selected as event type, the logging is performed according to + parameter loggingInterval at regular intervals only when the + conditions indicated by eventThresholdL1, + hysteresisL1, timeToTriggerL1 (defining the thresholds, hysteresis + and time to trigger) are met and if UE is 'camped normally' state + (TS 38.331, TS 38.304). In case 'out of coverage' is selected as + event type, the + logging is performed according to parameter loggingInterval at regular + intervals only when the UE is in 'any cell selection' state. + Furthermore, logging is performed immediately upon transition from the + 'any cell selection' state to the 'camped normally' state (TS 38.331, + TS 38.304)."; leaf traceCollectionEntityId { type int64; description "It specifies the TCE Id which is sent to the UE in - Logged MDT. See the clause 5.10.11 of 3GPP TS 32.422 for additional - details on the allowed values."; + Logged MDT."; + reference "Clause 5.10.11 of 3GPP TS 32.422."; } leaf loggingDuration { @@ -1296,24 +1421,30 @@ module _3gpp-common-trace { units seconds; description "Specifies how long the MDT configuration is valid at the UE in case of Logged MDT. The attribute is applicable only for - Logged MDT and Logged MBSFN MDT. In case this attribute is not used, it - carries a null semantic."; - reference "5.10.9 of 3GPP TS 32.422"; + Logged MDT and Logged MBSFN MDT."; + reference "Clause 5.10.9 of 3GPP TS 32.422."; } leaf loggingInterval { when '../../../jobType = "LOGGED_MDT_ONLY" or' + ' ../../../jobType = "LOGGED_MBSFN_MDT"'; - type uint32 { - range "0|320|640|1280|2560|5120|10240|20480|" - +"30720|40960|61440"; + type enumeration { + enum 320ms; + enum 640ms; + enum 1280ms; + enum 2560ms; + enum 5120ms; + enum 10240ms; + enum 20480ms; + enum 30720ms; + enum 40960ms; + enum 61440ms; + enum INFINITY; } - units milliseconds; + description "Specifies the periodicty for Logged MDT. The attribute is - applicable only for Logged MDT and Logged MBSFN MDT. In case this - attribute is not used, it carries a null semantic. - The value 0 indicates Infinity for NR."; - reference "5.10.8 of 3GPP TS 32.422"; + applicable only for Logged MDT and Logged MBSFN MDT."; + reference "Clause 5.10.8 of 3GPP TS 32.422."; } leaf reportType { @@ -1323,7 +1454,7 @@ module _3gpp-common-trace { enum EVENT_TRIGGERED; } description "It specifies report type for logged NR MDT"; - reference "Clause 5.10.27 of 3GPP TS 32.422"; + reference "Clause 5.10.27 of 3GPP TS 32.422."; } leaf eventListForEventTriggeredMeasurement { @@ -1338,7 +1469,7 @@ module _3gpp-common-trace { condition being fulfilled: - Out of coverage. - A2 event."; - reference "Clause 5.10.28 of 3GPP TS 32.422"; + reference "Clause 5.10.28 of 3GPP TS 32.422."; } leaf eventThresholdL1 { @@ -1351,9 +1482,8 @@ module _3gpp-common-trace { the reporting in case of event based reporting of logged NR MDT. The attribute is applicable only for Logged MDT and when reportType is configured for event triggered reporting and when - eventListForEventTriggeredMeasurement is configured for L1 event. - In case this attribute is not used, it carries a null semantic."; - reference "clause 5.10.36 of TS 32.422"; + eventListForEventTriggeredMeasurement is configured for L1 event."; + reference "clause 5.10.36 of TS 32.422."; } leaf hysteresisL1 { @@ -1366,9 +1496,8 @@ module _3gpp-common-trace { condition of the L1 event based reporting of logged NR MDT. The attribute is applicable only for Logged MDT, when reportType is configured for event triggered reporting and when - eventListForEventTriggeredMeasurement is configured for L1 event. - In case this attribute is not used, it carries a null semantic."; - reference "clause 5.10.37 of TS 32.422"; + eventListForEventTriggeredMeasurement is configured for L1 event. "; + reference "clause 5.10.37 of TS 32.422."; } leaf timeToTriggerL1 { @@ -1382,22 +1511,11 @@ module _3gpp-common-trace { the reporting in case of event based reporting of logged NR MDT. The attribute is applicable only for Logged MDT, when reportType is configured for event triggered reporting and when - eventListForEventTriggeredMeasurement is configured for L1 event. - In case this attribute is not used, it carries a null semantic."; - reference "clauses 5.10.38 of TS 32.422"; - } - - list pLMNList { - when '../../../jobType = "LOGGED_MDT_ONLY"'; - key "mcc mnc"; - uses types3gpp:PLMNId; - max-elements 16; - description "It indicates the PLMNs where measurement collection, status - indication and log reporting is allowed."; - reference "Clause 5.10.24 of 3GPP TS 32.422"; + eventListForEventTriggeredMeasurement is configured for L1 event."; + reference "clauses 5.10.38 of TS 32.422."; } - list areaConfigurationForNeighCells { + list areaConfigurationForNeighCell { when '../../../jobType = "LOGGED_MDT_ONLY"'; key "idx"; leaf idx { type uint32 ; } @@ -1407,7 +1525,7 @@ module _3gpp-common-trace { all the neighbour cells. Applicable only to NR Logged MDT."; - reference "3GPP TS 32.422 clause 5.10.26."; + reference "Clause 5.10.26 of 3GPP TS 32.422."; uses AreaConfigGrp; } @@ -1419,7 +1537,7 @@ module _3gpp-common-trace { description "The MBSFN Area consists of a MBSFN Area ID and Carrier Frequency (EARFCN). The target MBSFN area List can have up to 8 entries. This parameter is applicable only if the job type is Logged MBSFN MDT."; - reference "5.10.25 of 3GPP TS 32.422"; + reference "Clause 5.10.25 of 3GPP TS 32.422."; uses MbsfnAreaGrp; } @@ -1439,13 +1557,9 @@ module _3gpp-common-trace { description "Defines the configuration parameters of IOC TraceJob which are specific for MDT. The attribute anonymizationOfMdtData specifies the level of anonymization - of MDT data. The optional attribute areaScope allows to - specify the area in terms of cells or Tracking Area/Routing - Area/Location area where the MDT data collection shall take - place. In case of RLF_REPORT_ONLY and RCEF_REPORT_ONLY the - optional attribute areaScope allows to specify the eNB or list - of eNBs or gNB or list of gNBs where the reports should be - collected. The optional attribute sensorInformation allows to + of MDT data. The attribute areaScope defines the area scope of MDT, + which is specified in clause 5.10.2 of TS 32.422. The + optional attribute sensorInformation allows to specify the sensor information to include. Based on the value configured for attribute jobType in IOC TraceJob, the attributes immediateMdtConfig or loggedMdtConfig are available: In case of @@ -1453,35 +1567,23 @@ module _3gpp-common-trace { immediateMdtConfig is applicable. In case of LOGGED_MDT_ONLY or LOGGED_MBSFN_MDT the attribute loggedMdtConfig is applicable."; - leaf anonymizationOfMDTData { + leaf anonymizationOfMdtData { when ../areaScope ; type enumeration { enum NO_IDENTITY; enum TAC_OF_IMEI; } default NO_IDENTITY; - description "Specifies level of MDT anonymization."; - reference "3GPP TS 32.422 clause 5.10.12."; + description "Specifies the level of anonymization of MDT data. + This attribute is only applicable for management based activation"; + reference "Clause 5.10.12 of 3GPP TS 32.422."; } list areaScope { key "idx"; leaf idx { type uint32 ; } - description "It specifies the area where data shall be collected. - List of eNB/list of gNB/eNB/gNB for RLF or RCEF. - - List of cells/TA/LA/RA for signaling based MDT or management - based Logged MDT. - - List of cells for management based Immediate MDT. - - List of NPN IDs for management based MDT. - - Cell, TA, LA, RA are mutually exclusive. - - This attribute shall be present if MDT is supported."; - reference "Clause 5.10.2 of 3GPP TS 32.422"; - + description "It specifies the area where data shall be collected."; + max-elements 1; uses AreaScopeGrp; } @@ -1492,17 +1594,13 @@ module _3gpp-common-trace { enum UE_ORIENTATION; } description "It specifies which sensor information shall be included in - logged NR MDT and immediate NR MDT measurement if they are available. - The following sensor measurement can be included or excluded for - the UE."; - reference "Clause 5.10.29 of 3GPP TS 32.422"; + logged NR MDT and immediate NR MDT measurement if they are available."; + reference "Clause 5.10.29 of 3GPP TS 32.422."; } list immediateMdtConfig { description "The set of parameters specific for Immediate MDT - configuration. - This attribute shall be present only if MDT is supported and the jobType - attribute is set to Immediate MDT or combined Trace and Immediate MDT"; + configuration."; key idx; max-elements 1; leaf idx { type string; } @@ -1511,30 +1609,63 @@ module _3gpp-common-trace { list loggedMdtConfig { description "The set of parameters specific for Logged MDT and Logged - MBSFN MDT configuration. - This attribute shall be present only if MDT is supported and the - jobType attribute is set to Logged MDT or Logged MBSFN MDT."; + MBSFN MDT configuration."; key idx; max-elements 1; leaf idx { type string; } uses LoggedMdtConfigGrp; } + + leaf mNOnly { + type boolean; + default false; + description "Specifies whether the MDT configuration is for MN + only or not. The value FALSE means the MDT configuration is for + both MN and SN. The value TRUE means the MDT configuration is + for MN only."; + } + + list pLMNList { + key "mcc mnc"; + uses types3gpp:PLMNId; + max-elements 16; + description "It indicates the PLMNs where measurement collection. "; + reference "Clause 5.10.24 of 3GPP TS 32.422."; + } } - grouping UEMeasConfigGrp { - description "Represents the UEMeasConfig dataType. - This <> defines the aconfiguration parameters of IOC TraceJob - which are specific for UE level measurements collection."; + grouping UECoreMeasConfigGrp { + description "Represents the UECoreMeasConfig dataType. + This <> defines the aconfiguration parameters of IOC + TraceJob which are specific for 5GC UE level measurements + collection."; - leaf-list ueMeasurements { + leaf-list ueCoreMeasurements { type string; - description "It specifies the List of UE level measurements."; - } - - leaf ueMeasGranularityPeriod { + min-elements 1; + description "List of 5GC UE level measurements identified by name. + The list may include 5GC UE level measurements + defined in TS 28.558, or vendor specific measurements. + + For 5GC UE level measurements defined in TS 28.558, the + name is constructed as follows: + 'family.measurementName.subcounter' for measurement type + with specified subcounter + 'family.measurementName.ALL' for measurement type with all + supported subcounters + 'family.measurementName' for measurement type without + subcounters + 'family' for measurement family, including all measurement + types and + the associated subcounters under this family. + For non-3GPP specified 5GC UE level measurements the name is + defined elsewhere."; + } + + leaf ueCoreMeasGranularityPeriod { type uint32; - description "It specifies the Granularity period used to produce UE level - measurements. The period is defined in milliseconds (ms)."; + description "Granularity period used to produce 5GC UE + level measurements. The period is defined in milliseconds (ms)."; } leaf nfTypeToMeasure { @@ -1550,12 +1681,16 @@ module _3gpp-common-trace { leaf-list objectInstances { type string; - description "List of object instances."; + description "List of object instances. + Each object instance is identified by its DN."; } leaf-list rootObjectInstances { type string; - description "List of root object instances."; + description "List of object instances. + Each object instance is identified by its DN and designates + the root of a substree that contains the root object and all + descendant objects."; } } @@ -1576,22 +1711,17 @@ module _3gpp-common-trace { enum TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS; } default TRACE_ONLY; - description "Specifies the MDT mode and it specifies also whether the - TraceJob represents only MDT, Logged MBSFN MDT, Trace, or 5GC UE - level measurement collection, or any combination - of Trace, immediate MDT and 5GC UE level measurement collection. - The attribute is applicable for Trace, MDT, RCEF and - RLF reporting, and 5GC UE level measurement collection."; - reference "Clause 5.9a of 3GPP TS 32.422 for additional details on the - allowed values."; + description "It specifies whether the + TraceJob represents only MDT, Logged MBSFN MDT, Trace, or + 5GC UE level measurements job, or a combined job. It also + defines the MDT mode."; + reference "Clause 5.9a of 3GPP TS 32.422."; } list pLMNTarget { key "mcc mnc"; description "Specifies which PLMN that the subscriber of the session to - be recorded uses as selected PLMN. PLMN Target might differ from the - PLMN specified in the Trace Reference"; - reference "Clause 5.9b of 3GPP TS 32.422"; + be recorded uses as selected PLMN."; uses types3gpp:PLMNId; } @@ -1600,8 +1730,14 @@ module _3gpp-common-trace { when '../jobType = "TRACE_ONLY"' + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type string; - description "Specifies the metrics to be reported."; - reference "Clause 10 of 3GPP TS 32.422"; + description "List of trace metrics identified by name. + Includes trace messages, MDT measurements (Immediate MDT, + Logged MDT, Logged MBSFN MDT), RLF and RCEF reports, + see TS 32.422). Trace messages are identified with their message + identifier. Trace metric identifier is constructed as + defined in clause 10 of TS 32.422. + For non-3GPP specified trace metrics the name is defined elsewhere."; + reference "Clause 10 of 3GPP TS 32.422."; } leaf traceCollectionEntityIPAddress { @@ -1609,9 +1745,8 @@ module _3gpp-common-trace { description "It specifies the address of the Trace Collection Entity when the attribute traceReportingFormat is configured for the file-based reporting. The attribute is applicable for both Trace and - MDT. - See the clause 5.9 of TS 32.422 for additional details on the allowed - values."; + MDT."; + reference "Clause 5.9 of 3GPP TS 32.422."; } leaf traceReportingConsumerUri { @@ -1619,7 +1754,7 @@ module _3gpp-common-trace { type inet:uri; description "URI of the Streaming Trace data reporting MnS consumer (a.k.a. streaming target)."; - reference "Clause 5.9 of 3GPP TS 32.422"; + reference "Clause 5.9 of 3GPP TS 32.422."; } list traceReference { @@ -1631,7 +1766,7 @@ module _3gpp-common-trace { In case of shared network, it is the MCC and MNC of the Participating Operator that request the trace session that shall be provided. The attribute is applicable for both Trace and MDT."; - reference "Clause 5.6 of 3GPP TS 32.422"; + reference "Clause 5.6 of 3GPP TS 32.422."; leaf idx { type uint32 ; } uses trace3gpp:TraceReferenceGrp ; @@ -1641,15 +1776,14 @@ module _3gpp-common-trace { type string; yext3gpp:inVariant; description "Identifier of a TraceJob"; - yext3gpp:inVariant; } leaf traceReportingFormat { type enumeration { - enum FILE_BASED; + enum FILE-BASED; enum STREAMING; } - default FILE_BASED; + default FILE-BASED; description "Specifies the trace reporting format - streaming trace reporting or file-based trace reporting"; reference "3GPP TS 32.422 clause 5.11"; @@ -1666,8 +1800,8 @@ module _3gpp-common-trace { enum IMEISV; enum PUBLIC_ID; enum UTRAN_CELL; - enum E_UTRAN_CELL; - enum NG_RAN_CELL; + enum E-UTRAN_CELL; + enum NG-RAN_CELL; enum ENB; enum RNC; enum GNB; @@ -1683,13 +1817,20 @@ module _3gpp-common-trace { attribute is applicable for both Trace and MDT. This attribute includes the ID type of the target as an enumeration and the ID value. - The traceTarget shall be public ID in case of a Management Based - Activation is done to an ScscfFunction. The traceTarget shall be - cell only in case of the UTRAN cell traffic trace function. + The traceTarget shall be 'PUBLIC_ID' in case of a Management Based + Activation is done to an SCSCFFunction (Serving Call Session + Control Function) or PCSCFFunction (Proxy Call Session Control + Function). The traceTarget shall be 'UTRAN_CELL' only in case + of the UTRAN cell traffic trace function. + + The traceTarget shall be 'E-UTRAN_CELL' only in case of E-UTRAN cell + traffic trace function. - The traceTarget shall be E-UtranCell only in case of E-UTRAN cell - traffic trace function.The traceTarget shall be either IMSI or - IMEI(SV) if the Trace Session is activated to any of the following + The traceTarget shall be 'NG-RAN_CELL' only in case of NR cell + traffic trace function. + + The traceTarget shall be either 'IMSI', 'IMEI' or + 'IMEISV' if the Trace Session is activated to any of the following ManagedEntity(ies): - HssFunction - MscServerFunction @@ -1698,29 +1839,31 @@ module _3gpp-common-trace { - BmscFunction - RncFunction - MmeFunction - - The traceTarget shall be IMSI if the Trace Session is activated to a - ManagedEntity playing a role of ServinGWFunction. - - In case of signaling based Trace/MDT, the traceTarget attribute shall - be able to carry (IMSI or IMEI(SV)or SUPI), the mDTAreaScope attribute - shall be able to carry a list of (cell or E-UtranCell or NRCellDU or - TA/LA/RA). - - In case of management based Immediate MDT, the traceTarget attribute - shall be null value, the mDTAreaScope attribute shall carry a list of - (Utrancell or E-UtranCell or NRCellDU). - - In case of management based Logged MDT, the traceTarget attribute - shall carry an eBs or a RNC or gNBs. The Logged MDT should be initiated - on the specified eNB or RNC or gNB in traceTarget. The mDTAreaScope - attribute shall carry a list of (Utrancell or E-UtranCell or NRCellDU or - TA/LA/RA). - - In case of RLF reporting, or RCEF reporting, the traceTarget - attribute shall be null value, the mDTAreaScope attribute shall carry - one or list of eNBs/gNBs"; - reference "3GPP TS 32.422"; + - ServingGWFunction + - PGWFunction + + The traceTarget shall be either 'SUPI' or 'IMEISV' if the Trace Session + is activated to any of the followed ManagedEntity(ies): + - AFFunction + - AMFFunction + - AUSFFunction + - NEFFunction + - NRFFunction + - NSSFFunction + - PCSCFFunction + - SMFFunction + - UPFFunction + - UDMFunction + + In case of signalling based MDT, the traceTarget attribute should + be able to carry 'PUBLIC_ID', 'IMSI', 'IMEI', 'IMEISV' or 'SUPI'. + + In case of management based 5GC UE level measurements collection, + the traceTarget attribute shall be able to carry the corresponding + Measured UE Identifier as defined by the bullet g) of the 5GC UE + level measurements (see TS 28.558) when the TraceJob is created + at the subject ManagedEntity."; + reference "3GPP TS 32.422."; } list traceConfig { @@ -1752,7 +1895,7 @@ module _3gpp-common-trace { leaf idx { type string; } } - list ueMeasConfig { + list ueCoreMeasConfig { when '../jobType = "5GC_UE_LEVEL_MEASUREMENTS_ONLY"' + ' or ../jobType = "TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS"' + ' or ../jobType = "IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS"' @@ -1761,7 +1904,7 @@ module _3gpp-common-trace { key idx; description "5GC UE level measurements config"; max-elements 1; - uses UEMeasConfigGrp; + uses UECoreMeasConfigGrp; leaf idx { type string; } } @@ -1779,7 +1922,7 @@ module _3gpp-common-trace { grouping TraceSubtree { description "Contains classes that manage Tracing. Should be used in all classes (or classes inheriting from) - - SubNnetwork + - SubNetwork - ManagedElement - ManagedFunction @@ -1834,15 +1977,15 @@ module _3gpp-common-trace { when several PLMNs are supported in the RAN. The attribute jobType specifies the kind of data to collect. In case of - Trace only, the configuration parameters of attribute traceConfig shall - be applied. In case of Immediate MDT only, Logged MDT only, RLF reports + Trace only, the configuration parameters of attribute traceConfig shall + be applied. In case of Immediate MDT only, Logged MDT only, RLF reports only, RCEF reports only and Logged MBSFN MDT, the configuration parameters of attribute mdtConfig or a subset of these shall be - applied. In case of UE measurements only, the configuration parameters - of attribute ueMeasConfig shall be applied. In case of any combination - of Trace, Immediate MDT, Trace and UE measurements, the configuration - parameters of the corresponding attributes traceConfig, mdtConfig and - ueMeasConfig are applicable. + applied. In case of UE measurements only, the configuration parameters + of attribute ueCoreMeasConfig shall be applied. In case of any + combination of Trace, Immediate MDT, Trace and UE measurements, the + configuration parameters of the corresponding attributes traceConfig, + mdtConfig and ueCoreMeasConfig are applicable. Creation and deletion of TraceJob instances by MnS consumers is optional; when not supported, the TraceJob instances may be created diff --git a/yang-models/_3gpp-common-util.yang b/yang-models/_3gpp-common-util.yang index 6e58aa14fcdb98d95f9dc78d1c20c12fcf447b0c..389f5db6ecef7f87ea47b0bb7cfdd5392118cc4f 100644 --- a/yang-models/_3gpp-common-util.yang +++ b/yang-models/_3gpp-common-util.yang @@ -3,6 +3,7 @@ module _3gpp-common-util { namespace urn:3gpp:sa5:_3gpp-common-util; prefix "util3gpp"; + import ietf-yang-types { prefix yang ; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-yang-types { prefix types3gpp ; } import _3gpp-common-managed-element { prefix me3gpp ; } @@ -16,6 +17,7 @@ module _3gpp-common-util { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623"; + revision 2024-07-30 { reference "CR-0392 CR-0393"; } revision 2024-05-06 { reference CR-0359; } feature SchedulerUnderManagedElement { @@ -157,14 +159,22 @@ module _3gpp-common-util { description "Represents the Scheduler IOC."; leaf condition { - type string { + type yang:xpath1.0 { length 1..max; } mandatory true; - description "Logical expression of one or several condition(s). - - A restricted XPath may be used. The definition of the exact syntax - is not ready yet. + description "A logical condition containing an XPath expression. + The leaf contains an XPath 1.0 string with the following restrictions + - The accessible tree is the full Network Resource Model + - The root node is the list representing the top level MOI + (E.g. ManagedElement) + - In the accessible tree, all leafs and leaf-lists with default values + in use exist + - The data tree has no concept of document order except when 'ordered-by + user' is declared. + - The set of variable bindings is empty. + - The function library is the core function library defined in XPATH + - Namespaces should be ignored when evaluating the expression An empty string is not allowed."; } @@ -173,7 +183,8 @@ module _3gpp-common-util { type boolean; mandatory true; config false; - description "Switches between TRUE and FALSE depending upon whether the + description "The boolean result of the condition. + Switches between TRUE and FALSE depending upon whether the configured constraints are fulfilled or not."; } } diff --git a/yang-models/_3gpp-common-yang-extensions.yang b/yang-models/_3gpp-common-yang-extensions.yang index dc9c8e5b5d4d34de17984cc7b005c6894d959b6e..22d1090a85380cd44393fa14e5b9a975ea71a0f0 100755 --- a/yang-models/_3gpp-common-yang-extensions.yang +++ b/yang-models/_3gpp-common-yang-extensions.yang @@ -38,7 +38,7 @@ module _3gpp-common-yang-extensions { If support for an extension is missing the extension statement needs individual handling or it SHOULD be removed from the module using the extension e.g. with a deviation. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -46,6 +46,7 @@ module _3gpp-common-yang-extensions { Solution Set (SS) definitions 3GPP TS 28.623"; + revision 2025-02-06{ reference "CR-0507, 0507" ; } revision 2024-04-05 { reference "CR-0332, 0333" ; } revision 2023-09-17 { reference "CR-0270, 0271" ; } revision 2022-10-31 { reference "CR-0195, 0196"; } @@ -65,7 +66,9 @@ module _3gpp-common-yang-extensions { Zero or one only-system-created statement per parent statement is allowed. No sub-statements are allowed. - Adding this statement is an NBC change, removing it is BC."; + Adding this statement is an NBC change, + removing it is BC, however if the system behavior is also changed in + parallel (the system stops creating the MOIs), this behavior is NBC."; } extension notNotifyable { @@ -73,14 +76,16 @@ module _3gpp-common-yang-extensions { "Indicates that data change notifications shall not be sent for this attribute. If the extension is not present and other conditions are fulfilled data change notification should be sent. + If a list or container already has the notNotifyable extension, that is also valid for all contained data nodes. The statement MUST only be a substatement of a leaf, leaf-list, list, container statement that is contained within the 'attributes' container of an IOC and that represents an attribute or sub-parts of - an attribute . - + an attribute. If the attribute is represented by a container or list, + the statement shall be put on these, not on data nodes inside the + list/container. Zero or one notNotifyable statement is allowed per parent statement. NO substatements are allowed. @@ -103,8 +108,12 @@ module _3gpp-common-yang-extensions { It is unnecessary to use and MUST NOT be used for key leafs. - The statement MUST only be a substatement of a leaf, leaf-list, list - statement that is config=true. + The statement MUST only be a substatement of a leaf, leaf-list, list, + container statement that is contained within the 'attributes' + container of an IOC and that represents an attribute or sub-parts of + an attribute and is config=true. If the attribute is represented by a + container or list, the statement shall be put on these, not on data + nodes inside the list/container. Zero or one inVariant statement is allowed per parent statement. NO substatements are allowed. diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 3c8b9c7a4299b5a44b8c95d7387ee78f145d5767..27a9ba3704c9bfad7211c97af7aa3ddbe95b5fd6 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -12,10 +12,16 @@ module _3gpp-common-yang-types { description "The model defines a YANG mapping of the top level information classes used for management of 5G networks and network slicing. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623"; + revision 2025-11-06 { reference CR-1639 ; } + revision 2025-10-06 { reference CR-0581; } + revision 2025-08-18 { reference CR-1557; } + revision 2025-08-06 { reference CR-0563; } + revision 2025-02-18 { reference CR-0511; } + revision 2025-02-06 { reference CR-0507; } revision 2024-05-18 { reference CR-0359; } revision 2024-04-12 { reference CR-0346; } revision 2023-11-06 { reference CR-0305; } @@ -70,24 +76,12 @@ module _3gpp-common-yang-types { leaf value { type string; } } - typedef DayOfWeekT { - type enumeration { - enum Monday; - enum Tuesday; - enum Wednesday; - enum Thursday; - enum Friday; - enum Saturday; - enum Sunday; - } - } - typedef DayOfWeek { type enumeration { enum MONDAY; enum TUESDAY; enum WEDNESDAY; - enum THURSADY; + enum THURSDAY; enum FRIDAY; enum SATURDAY; enum SUNDAY; @@ -114,7 +108,27 @@ module _3gpp-common-yang-types { yext3gpp:inVariant; } } + grouping SNssai { + description + "Single Network Slice Selection Assistance Information(S-NSSAI)"; + reference "3GPP TS 23.003"; + leaf sd { + description "Slice Differentiator + If not needed, the value can be set to ff:ff:ff."; + type yang:hex-string { + length 8; + } + reference "3GPP TS 23.003"; + } + + leaf sst { + type uint8; + description "Slice/Service Type. + Values 0 to 127 belong to standardized SST range and are defined in + 3GPP TS 23.501. Values 128 to 255 belong to operator-specific range."; + } + } grouping ProcessMonitorGrp { description "Provides attributes to monitor the progress of processes with specific purpose and limited lifetime running on MnS producers. @@ -276,6 +290,47 @@ module _3gpp-common-yang-types { } } + grouping NpnIdGrp { + description "Represents the NPN supported by the <> using this + <> as one of its attributes in case of the cell is a + NPN-only cell."; + + list plmnId { + key "mcc mnc"; + min-elements 1; + description "It specifies the PLMN Id of the NPN network."; + uses types3gpp:PLMNId; + } + + choice npnidChoice { + leaf-list cAGIdList { + type string { + pattern '^[A-Fa-f0-9]{8}$'; + } + max-elements 256; + description "It identifies a CAG list containing up to 12 + CAG-identifiers per Ue or up to 12 CAG-identifiers per cell, + see TS 38.331. + CAG ID is used to combine with PLMN ID to identify a PNI-NPN.CAG ID is + a hexadecimal range with size 32 bit"; + } + + leaf-list nIDList { + type string { + pattern '^[A-Fa-f0-9]{11}$'; + } + max-elements 16; + description "It identifies a list of NIDs containing up to 16 NIDs, see + TS 38.331. NID is used to combine with PLMN ID to identify an SNPN. + NID is a hexadecimal range with size 44 bit."; + } + } + } + + + + + typedef TenthOfDegrees { type uint16 { range 0..3600; @@ -312,7 +367,7 @@ module _3gpp-common-yang-types { grouping GeographicalCoordinates { description "This datatype represents the geographical coordinates"; - reference "#GPP TS 28.558 clause 6.3.8"; + reference "3GPP TS 28.538 clause 6.3.8"; leaf latitude { type Latitude; @@ -323,11 +378,6 @@ module _3gpp-common-yang-types { type Longitude; mandatory true; } - - leaf altitude { - type Altitude; - } - } typedef OnOff { @@ -336,101 +386,41 @@ module _3gpp-common-yang-types { enum OFF; } } - - // grouping ManagedNFProfile will be removed as it is - // being moved to _3gpp-5gc-nrm-nfprofile - grouping ManagedNFProfile { - description "Defines profile for managed NF"; - reference "3GPP TS 23.501"; - - leaf idx { type uint32 ; } - - leaf nfInstanceID { - config false; - mandatory true; - type yang:uuid ; - description "This parameter defines profile for managed NF. - The format of the NF Instance ID shall be a - Universally Unique Identifier (UUID) version 4, - as described in IETF RFC 4122 " ; - yext3gpp:inVariant; - } - - leaf-list nfType { - config false; - min-elements 1; - type NfType; - description "Type of the Network Function" ; - } - - leaf hostAddr { - mandatory true; - type inet:host ; - description "Host address of a NF"; - } - - leaf authzInfo { - type string ; - description "This parameter defines NF Specific Service authorization - information. It shall include the NF type (s) and NF realms/origins - allowed to consume NF Service(s) of NF Service Producer."; - reference "See TS 23.501" ; - } - - leaf location { - type string ; - description "Information about the location of the NF instance - (e.g. geographic location, data center) defined by operator"; - reference "TS 29.510" ; - } - - leaf capacity { - mandatory true; - type uint16 ; - description "This parameter defines static capacity information - in the range of 0-65535, expressed as a weight relative to other - NF instances of the same type; if capacity is also present in the - nfServiceList parameters, those will have precedence over this value."; - reference "TS 29.510" ; - } - - leaf nFSrvGroupId { - type string ; - description "This parameter defines identity of the group that is - served by the NF instance. - May be config false or true depending on the ManagedFunction. - Config=true for Udrinfo. Config=false for UdmInfo and AusfInfo. - Shall be present if ../nfType = UDM or AUSF or UDR. "; - reference "TS 29.510" ; + grouping SPNInfoIdGrp { + description "This data type represents the SNPN identification + consisting of MCC, MNC, and optionally NID."; + leaf mcc { + type string; + description "Mobile Country Code (MCC) of the SNPN."; } - - leaf-list supportedDataSetIds { - type enumeration { - enum SUBSCRIPTION; - enum POLICY; - enum EXPOSURE; - enum APPLICATION; - } - description "List of supported data sets in the UDR instance. - May be present if ../nfType = UDR"; - reference "TS 29.510" ; + + leaf mnc { + type string; + description "Mobile Network Code (MNC) of the SNPN."; + } + + leaf nId { + type string; + description "Network Identifier (NID) of the SNPN."; + } + } + grouping SNPNIdGrp { + description "This <> represents the information of a SNPN + identification"; + leaf mCC { + description "This is the Mobile Country Code (MCC) of the PLMN + identifier. See TS 23.003 [13] subclause 2.2 and 12.1"; + type string; } - - leaf-list smfServingAreas { - type string ; - description "Defines the SMF service area(s) the UPF can serve. - Shall be present if ../nfType = UPF"; - reference "TS 29.510" ; + leaf mNC { + description "This is the Mobile Network Code (MNC) of the PLMN + identifier. See TS 23.003 [13] subclause 2.2 and 12.1."; + type string; } - - leaf priority { - type uint16; - description "This parameter defines Priority (relative to other NFs - of the same type) in the range of 0-65535, to be used for NF selection; - lower values indicate a higher priority. If priority is also present - in the nfServiceList parameters, those will have precedence over - this value. Shall be present if ../nfType = AMF "; - reference "TS 29.510" ; + leaf nId { + description "Network Identity; Shall be present if PlmnIdNid + identifies an SNPN"; + type string; } } @@ -644,6 +634,10 @@ module _3gpp-common-yang-types { global reference frame (WGS 84). Positive values correspond to degrees east of 0 degrees longitude."; } + + leaf altitude { + type Altitude; + } } grouping GeoAreaGrp { @@ -980,10 +974,14 @@ module _3gpp-common-yang-types { deleted, the 'NtfSubscriptionControl' instance created due to the request for implicit subscription shall be deleted as well. - - When only the fileReportingPeriod and fileLocation attributes are - present, the MnS producer shall store the files on a MnS consumer, that - can be any entity such as a file server, at the location specified by - fileLocation. No notification is emitted by the MnS producer. + - When only the 'fileReportingPeriod' and 'fileLocation' attributes + are present (CHOICE_3), the MnS producer shall store the files at the + location specified by 'fileLocation'. The file location may identify + any entity such as a file server or a MnS consumer. The identified + MnS consumer may or may not be identical to the MnS consumer creating + the 'PerfMetricJob'. The MnS producer may emit 'notifyFileReady' and + 'notifyFilePreparationError' notifications to inform subscribers that + a file has been made available at the location specified by 'fileLocation'. - When only the streamTarget attribute is present, the MnS producer shall stream the data to the location specified by streamTarget. diff --git a/yang-models/_3gpp-eqp-antennafunction.yang b/yang-models/_3gpp-eqp-antennafunction.yang new file mode 100644 index 0000000000000000000000000000000000000000..0497c401179294db263f32d455ec3f6cee4f6ada --- /dev/null +++ b/yang-models/_3gpp-eqp-antennafunction.yang @@ -0,0 +1,195 @@ +module _3gpp-eqp-antennafunction { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-eqp-antennafunction"; + prefix "ant3gpp"; + + import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-common-top { prefix top3gpp; } + + organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "Defines the YANG mapping of the Antenna Function Information + Object Class (IOC) that is part of the Generic Network Resource Model (NRM). + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + + revision 2025-08-12 { reference "CR1580"; } + revision 2025-03-27 { reference "Initial revision"; } + + grouping AntennaFunctionGrp { + description "Represents the AntennaFunction."; + uses mf3gpp:ManagedFunctionGrp; + + leaf beamTilt { + description "The beam tilt of the wanted antenna beam + in the vertical plane. A positive value on the + beamtilt indicates an antenna beam direction below the + vertical plane."; + units degree; + type types3gpp:TenthOfDegrees; + } + + leaf bearing { + description "The bearing in degrees that the antenna is pointing in. + AllowedValues: See \"Antenna bearing\" in 3GPP TS 25.463."; + reference "3GPP TS 25.463, UTRAN Iuant interface: + Remote Electrical Tilting (RET) + antennas Application Part (RETAP) signalling"; + type types3gpp:TenthOfDegrees; + } + + leaf elevation { + description "The elevation the antenna function should have, + based on World Geodetic System (1984 version) global + reference frame (WGS 84). Positive values correspond to + meters above sea level, negative values correspond to meters + below sea level. If empty, value is not defined."; + type types3gpp:Altitude; + } + + leaf horizBeamWidth { + description "The 3 dB power beamwidth of the antenna pattern + in the horizontal plane. + A value of 360 indicates an omnidirectional antenna. + Note: The value of this attribute has no operational impact + on the network, e.g. the NE behaviour is not affected by the + value setting of this attribute. + Note as well that this attribute is not supported over the + Iuant interface according to 3GPP TS37.466. + A single integral value corresponding to an angle in degrees + between 0 and 360."; + reference "3GPP TS 37.466, Iuant interface: Application part"; + type types3gpp:TenthOfDegrees; + } + + leaf latitude { + description "Latitude of transmitter antenna position. + Positive value means north, negative value means south. + + Specification: WGS 84 + Allowed Values: { -90.000000..90.000000 }"; + units degree; + type types3gpp:Latitude; + } + + leaf longititude { + description "Longitude of transmitter antenna position. + Positive value means east, negative value means west. + Specification: WGS 84 + Allowed Values: { -180.000000..180.000000 }"; + units degree; + type types3gpp:Longitude; + } + + leaf maxAzimuthValue { + description "The maximum amount of change of azimuth the RET + system can support. This is the change in degrees clockwise + from bearing. + Note: The value of this attribute has no operational impact + on the network, e.g. the NE behaviour is not affected by the + value setting of this attribute. + Note as well that this attribute is not supported over the + Iuant interface according to Ref. 3GPP TS 37.466. + A single decimal value corresponding to an angle in degrees + between 0 and 360 with a resolution of 0.1 degrees."; + reference "3GPP TS 37.466, Iuant interface: Application part"; + units degree; + type decimal64 { + range "0..360"; + fraction-digits 1; + } + } + + leaf minAzimuthValue { + description "The minimum amount of change of azimuth the RET + system can support. This is the change in degrees clockwise + from bearing. + Note: The value of this attribute has no operational impact + on the network, e.g. the NE behaviour is not affected by the + value setting of this attribute. + Note as well that this attribute is not supported over the + Iuant interface according to Ref. 3GPP TS 37.466. + A single decimal value corresponding to an angle in degrees + between 0 and 360 with a resolution of 0.1 degrees."; + reference "3GPP TS 37.466, Iuant interface: Application part"; + units degree; + type decimal64 { + range "0..360"; + fraction-digits 1; + } + } + + leaf-list referencedBy { + description "This attribute contains the DNs of one or more objects + that refer to this object. + + In the case of AntennaFunction, these referring objects may + include DNs of SectorEquipmentFunction instances if associations + between them and the AntennaFunction exist. + + Note: referencedBy is a DN datatype and so can reference an MOI + under a different ME"; + config false; + type types3gpp:DistinguishedName; + } + + + leaf retGroupName { + description "The group name is a textual, alpha-numeric string to + define a logical grouping of antennas which may be in different cells. + + This attribute permits the definition of a logical grouping + of the antennas. This may be defined either at + installation time, or by management activity"; + type string; + } + + leaf retTiltValue { + description "The electrical tilt setting of the antenna, \"Tilt value\" in + 3GPP TS 37.466."; + reference "3GPP TS 37.466, Iuant interface: Application part"; + type types3gpp:TenthOfDegrees; + } + + leaf vertBeamWidth { + description "The 3 dB power beamwidth of the antenna pattern in + the vertical plane. + The value of this attribute has no operational impact on + the network, e.g. the NE behaviour is not affected by the + value setting of this attribute. + This attribute is not supported over the Iuant interface + according to Ref. 3GPP TS 37.466."; + reference "3GPP TS 37.466, Iuant interface: Application part"; + units degree; + type uint32 { + range "0..180"; + } + } + + leaf-list theCellList { + description "This attribute contains the DNs of EUtranGenericCell + or UtranGenericCell if associations between them exist. + This attribute contains the DNs of GSMCellPart if association + between them exist. "; + config false; + status deprecated; + type types3gpp:DistinguishedName; + } + } + + augment "/me3gpp:ManagedElement" { + list AntennaFunction { + key id; + uses top3gpp:Top_Grp; + description "This MOI represents an array of radiating elements that + may be tilted to adjust the RF coverage of a cell(s)."; + container attributes { + uses AntennaFunctionGrp; + } + uses mf3gpp:ManagedFunctionContainedClasses; + } + } +} \ No newline at end of file diff --git a/yang-models/_3gpp-eqp-sectorequipmentfunction.yang b/yang-models/_3gpp-eqp-sectorequipmentfunction.yang new file mode 100644 index 0000000000000000000000000000000000000000..a710ec19247da9950b1f3b24a10731a7d1a7f9b2 --- /dev/null +++ b/yang-models/_3gpp-eqp-sectorequipmentfunction.yang @@ -0,0 +1,84 @@ +module _3gpp-eqp-sectorequipmentfunction { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-eqp-sectorequipmentfunction"; + prefix "scteqp3gpp"; + + import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-common-top { prefix top3gpp; } + + organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "Defines the YANG mapping of the Sector Equipment Function + Information Object Class (IOC) that is part of the Generic Network Resource + Model (NRM). + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + + revision 2025-08-12 { reference "CR1580"; } + revision 2025-05-06 { reference "Initial revision"; } + + grouping SectorEquipmentFunctionGrp { + description "Represents the SectorEquipmentFunction."; + uses mf3gpp:ManagedFunctionGrp; + + leaf confOutputPower { + description "It defines the allowed total power to use for all + cells together in this sector. + It may be set by the operator and/or limited by HW limitation + or licensed power, e.g.: 20, 40, 60, 80,120 watts"; + type uint32; + } + + leaf-list fqBandList { + description "The list of frequency bands/ranges supported by the + hardware associated with the SectorEquipmentFunction. The + earfcnDl and earfcnUl or earfcn of cells associated with the + SectorEquipmentFunction must be assigned one of the specified + frequency range values within the supported range. + + Valid frequency bands/ranges may be found in 3GPP TS 25.104 (UTRA), + 36.104 (E-UTRA) and 38.104 (NR). + + AllowedValues: + Operating band id or supported frequency tuple + expressed as a string. + + Examples for NR: + Bands: {'n1', 'n12'} + Frequencies: {'1920–1980, 2110–2170, FDD', '699–716, 729–746, FDD'}"; + config false; + type string; + } + + leaf-list referencedBy { + description "This attribute contains the DNs of one or more objects + that refer to this object. + + In the case of SectorEquipmentFunction , these referring objects + may include Cells, NRSectorCarriers if associations between them + and the SectorEquipmentFunction exist. + + Note: referencedBy is a DN datatype and so can reference an MOI + under a different ME"; + config false; + type types3gpp:DistinguishedName; + } + } + + augment "/me3gpp:ManagedElement" { + list SectorEquipmentFunction { + key id; + uses top3gpp:Top_Grp; + description "This IOC represents a set of cells within a geographical + area that has common functions relating to AntennaFunction, TMAFunction + and supporting equipment, such as power amplifier."; + container attributes { + uses SectorEquipmentFunctionGrp; + } + uses mf3gpp:ManagedFunctionContainedClasses; + } + } +} \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang index d0afa896a0b344c48d377034a81cd083c922a14e..884fcadfa93fbd68c045456a89f86ab7e84ca164 100755 --- a/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang +++ b/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang @@ -3,45 +3,49 @@ module _3gpp-nr-nrm-danrmanagementfunction { namespace "urn:3gpp:sa5:_3gpp-nr-nrm-danrmanagementfunction"; prefix "danrmanagementfunction3gpp"; - import _3gpp-common-top { prefix top3gpp; } import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } - - organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Defines the YANG mapping of the DANRManagementFunction Information Object Class - (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + description "Defines the YANG mapping of the DANRManagementFunction IOC + that is part of the NR Network Resource Model (NRM). + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-05-06 { reference "CR-1526 CR-1527" ; } // common for R18, R19 + revision 2024-08-19 { reference CR-1314 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2020-05-08 { reference S5-203316; } - grouping DANRManagementFunctionGrp { description "Represents the DANRManagementFunction IOC."; - reference "3GPP TS 28.541"; - uses top3gpp:Top_Grp; leaf intrasystemANRManagementSwitch { - description "This attribute determines whether the intra-system ANR function is activated or deactivated."; + description "This attribute determines whether the intra-system ANR + function is activated or deactivated."; type boolean; } leaf intersystemANRManagementSwitch { - description "This attribute determines whether the inter-system ANR function is activated or deactivated."; + description "This attribute determines whether the inter-system ANR + function is activated or deactivated."; type boolean; } - - } augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction" { - if-feature gnbcucp3gpp:DANRManagementFunction; + list DANRManagementFunction { + description "This IOC contains attributes to support the D-SON function + of ANR Management (See clause 6.4.1.3 in TS 28.313 ."; + key id; + max-elements 1; + uses top3gpp:Top_Grp; + container attributes { uses DANRManagementFunctionGrp; + } + } } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang index c1201b7fb86b6614652e30739d8e91c3946fd25f..6256edbac03ac4b0ed2319cb0742b87a8f26f11a 100755 --- a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang +++ b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang @@ -9,16 +9,18 @@ module _3gpp-nr-nrm-desmanagementfunction { import _3gpp-nr-nrm-nrcellcu { prefix nrcellcu3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-5g-common-yang-types { prefix type5g3gpp; } + import _3gpp-common-yang-types { prefix types3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the DESManagementFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-08-06 { reference CR-1332 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2021-08-05 { reference S5-214053/CR-0518; } revision 2020-05-08 { reference S5-203316; } @@ -139,7 +141,19 @@ module _3gpp-nr-nrm-desmanagementfunction { enum yes; enum no; } - } + } + leaf-list mLModelRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of MLModel ¨ + (See TS 28.105)."; + config false; + } + leaf-list aIMLInferenceFunctionRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of AIMLInferenceFunction + (See TS 28.105) ."; + config false; + } } grouping EsNotAllowedTimePeriodGrp { @@ -200,4 +214,4 @@ module _3gpp-nr-nrm-desmanagementfunction { if-feature subnet3gpp:DESManagementFunction; uses DESManagementFunctionSubtree; } -} \ No newline at end of file +} diff --git a/yang-models/_3gpp-nr-nrm-dlbofunction.yang b/yang-models/_3gpp-nr-nrm-dlbofunction.yang index 6ae29fa509cee4528a3574f313fd42fbc271729a..ecf970ba4c7d929434b9d9b8c97782c1603058a8 100644 --- a/yang-models/_3gpp-nr-nrm-dlbofunction.yang +++ b/yang-models/_3gpp-nr-nrm-dlbofunction.yang @@ -8,16 +8,18 @@ module _3gpp-nr-nrm-dlbofunction { import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-nr-nrm-nrcellcu { prefix nrcellcu3gpp; } + import _3gpp-common-yang-types { prefix types3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the DLBOFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-08-06 { reference CR-1332 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-03-25 { reference "CR-0683"; } revision 2021-10-22 { reference "CR-0577"; } @@ -60,7 +62,6 @@ module _3gpp-nr-nrm-dlbofunction { type int32 { range "-20..20"; } units "0.5 dB"; } - leaf minimumTimeBetweenHoTriggerChange { description "This parameter defines the minimum allowed time interval between two Handover Trigger change performed by MRO. This is used @@ -68,7 +69,18 @@ module _3gpp-nr-nrm-dlbofunction { type int32 { range "0..604800"; } units "1"; } - + leaf-list mLModelRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of MLModel ¨ + (See TS 28.105)."; + config false; + } + leaf-list aIMLInferenceFunctionRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of AIMLInferenceFunction + (See TS 28.105) ."; + config false; + } } grouping DLBOFunctionSubtree { @@ -101,4 +113,4 @@ module _3gpp-nr-nrm-dlbofunction { if-feature DLBOUnderSubNetwork; uses DLBOFunctionSubtree; } -} \ No newline at end of file +} diff --git a/yang-models/_3gpp-nr-nrm-dmrofunction.yang b/yang-models/_3gpp-nr-nrm-dmrofunction.yang index ea6ef52b7f65c2f8ea11bfa55949b6a0400ff19e..74fe98c73de40dfdb3b0ade3ea699dfc77275605 100755 --- a/yang-models/_3gpp-nr-nrm-dmrofunction.yang +++ b/yang-models/_3gpp-nr-nrm-dmrofunction.yang @@ -8,16 +8,18 @@ module _3gpp-nr-nrm-dmrofunction { import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-nr-nrm-nrcellcu { prefix nrcellcu3gpp; } + import _3gpp-common-yang-types { prefix types3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the DMROFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-08-06 { reference CR-1332 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-01-07 { reference CR-0633; } revision 2021-08-05 { reference S5-214053/CR-0518; } @@ -65,6 +67,18 @@ module _3gpp-nr-nrm-dmrofunction { enabled or disabled."; type boolean; } + leaf-list mLModelRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of MLModel ¨ + (See TS 28.105)."; + config false; + } + leaf-list aIMLInferenceFunctionRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of AIMLInferenceFunction + (See TS 28.105) ."; + config false; + } } grouping DMROFunctionSubtree { @@ -101,4 +115,4 @@ module _3gpp-nr-nrm-dmrofunction { if-feature subnet3gpp:DMROFunction; uses DMROFunctionSubtree; } -} \ No newline at end of file +} diff --git a/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang b/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang index 399bd2bfda1d3fcd59e3649ebb0c2482fc93f17b..cd55b40c5b470bfc921d6b4364b477c037bd1d30 100755 --- a/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang +++ b/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang @@ -14,10 +14,11 @@ module _3gpp-nr-nrm-drachoptimizationfunction { description "Defines the YANG mapping of the DRACHOptimizationFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-03-30 { reference CR-1503 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2021-08-05 { reference S5-214053/CR-0518; } revision 2021-01-25 { reference CR-0454 ; } @@ -52,7 +53,13 @@ module _3gpp-nr-nrm-drachoptimizationfunction { type TargetProbabilityT; } leaf numberofpreamblessent { - description "This attribute determines the number of preambles sent."; + description "This attribute indicates the number of preambles sent + used to configure a wanted distribution of RACH preambles in a + vendor implemented DRACH optimisation function. + Note: The DRACH optimization function may configure preambleTransMax + as defined in TS 38.331 [54]. The allowed values for preambleTransMax + are 3, 4, 5, 6, 7, 8, 10, 20, 50, 100, 200 (see 38.331 [54], + subclause 6.3.2)."; mandatory true; type NumberofpreamblessentT; } diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang new file mode 100644 index 0000000000000000000000000000000000000000..f971ade817c4f9222d6f7188a9c993d1cf004c02 --- /dev/null +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -0,0 +1,62 @@ +module _3gpp-nr-nrm-ecmappingrule { + yang-version 1.1; + namespace urn:3gpp:sa5:_3gpp-nr-nrm-ecmappingrule; + prefix ecmap3gpp; + + import _3gpp-common-top { prefix top3gpp; } + + organization "3gpp SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "This IOC represents the unified mapping rule input to support + Energy Cost Index Mapping when Energy Cost Reporting. + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.541"; + + revision 2025-05-06 { reference "CR-1526 CR-1527" ; } // common for R18, R19 + revision 2024-08-12 { reference "CR-1336 CR-1337"; } + + grouping NRECMappingRuleGrp { + description "Represents the unified mapping rule to support Energy Cost Mapping + when Energy Cost Reporting is supported. Can be name-contained by SubNetwork + or ManagedElement. It applies to all ManagedEntity contained by the parent."; + leaf eCMRInputMinValue { + type uint8; + description "The minimum value of to be applied + for mapping from this attribute to the energy cost."; + } + + leaf eCMRInputMaxValue { + type uint8; + description "The maximum value of to be applied + for mapping from this attribute to the energy cost."; + } + + leaf eCTimeInterval { + type uint8; + description "Time interval (in seconds) that + should be applied for collecting values of mapping + rule attribute to be used for computing the energy cost."; + units seconds; + } + } + + grouping NRECMappingRuleSubtree { + description "Helps augmenting NRECMappingRule into multiple places."; + list NRECMappingRule { + description "Represents the unified mapping rule, applicable for the + group of gNBs (within a certain area), for the calculation of the + energy cost (see TS 34.423). + + NRECMappingRule can be name-contained by SubNetwork or ManagedElement. + It applies to all ManagedEntity contained by the parent."; + key id; + uses top3gpp:Top_Grp; + min-elements 1; + max-elements 1; + container attributes { + uses NRECMappingRuleGrp; + } + } + } +} diff --git a/yang-models/_3gpp-nr-nrm-ep.yang b/yang-models/_3gpp-nr-nrm-ep.yang index 927bc49b110c13525092999f115c3ca6a56236f0..1bad0c7ffa0d6dd30c4f4127a3e93e9e9a56ebbb 100755 --- a/yang-models/_3gpp-nr-nrm-ep.yang +++ b/yang-models/_3gpp-nr-nrm-ep.yang @@ -15,10 +15,11 @@ module _3gpp-nr-nrm-ep { description "Defines the YANG mapping of the NR related endpoint Information Object Classes (IOCs) that are part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-05-06 { reference "CR-1526 CR-1527" ; } // common for R18, R19 revision 2023-09-18 { reference CR-1043 ; } revision 2022-01-07 { reference CR-0643; } revision 2021-05-01 { reference CR-0490; } @@ -46,16 +47,30 @@ module _3gpp-nr-nrm-ep { uses eprp3gpp:EP_Common; } - grouping EP_F1CGrp { - description "Represents the EP_F1C IOC."; - reference "3GPP TS 28.541, 3GPP TS 38.470"; - uses eprp3gpp:EP_Common; + grouping EP_F1CSubtree { + list EP_F1C { + description "Represents the local end point of the control plane + interface (F1-C) between the gNB-DU and gNB-CU or gNB-CU-CP."; + reference "3GPP TS 28.541, 3GPP TS 38.470"; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses eprp3gpp:EP_Common; + } + } } - grouping EP_F1UGrp { - description "Represents the EP_F1U IOC."; - reference "3GPP TS 28.541, 3GPP TS 38.470"; - uses eprp3gpp:EP_Common; + grouping EP_F1USubtree { + list EP_F1U { + description "Represents the local end point of the user plane + interface (F1-U) between the gNB-DU and gNB-CU or gNB-CU-UP."; + reference "3GPP TS 28.541, 3GPP TS 38.470"; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses eprp3gpp:EP_Common; + } + } } grouping EP_XnCGrp { @@ -114,16 +129,7 @@ module _3gpp-nr-nrm-ep { } } - list EP_F1C { - description "Represents the local end point of the control plane - interface (F1-C) between the gNB-DU and gNB-CU or gNB-CU-CP."; - reference "3GPP TS 28.541, 3GPP TS 38.470"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses EP_F1CGrp; - } - } + uses EP_F1CSubtree; list EP_NgC { description "Represents the local end point of the control plane @@ -176,16 +182,7 @@ module _3gpp-nr-nrm-ep { } } - list EP_F1U { - description "Represents the local end point of the user plane - interface (F1-U) between the gNB-DU and gNB-CU or gNB-CU-UP."; - reference "3GPP TS 28.541, 3GPP TS 38.470"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses EP_F1UGrp; - } - } + uses EP_F1USubtree; list EP_NgU { description "Represents the local end point of the NG user plane @@ -236,26 +233,12 @@ module _3gpp-nr-nrm-ep { augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" { if-feature EPClassesUnderGNBDUFunction; - list EP_F1C { - description "Represents the local end point of the control plane - interface (F1-C) between the DU and CU or CU-CP."; - reference "3GPP TS 28.541, 3GPP TS 38.470"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses EP_F1CGrp; + uses EP_F1CSubtree { + refine EP_F1C { + max-elements 1; } } - list EP_F1U { - description "Represents the local end point of the user plane - interface (F1-U) between the DU and CU or CU-UP."; - reference "3GPP TS 28.541, 3GPP TS 38.470"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses EP_F1UGrp; - } - } + uses EP_F1USubtree; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-eutranetwork.yang b/yang-models/_3gpp-nr-nrm-eutranetwork.yang index 3958b9c1a2350463faadd44093c3d56be03bf371..2448d72f5f2b9fa968d3a15fe5d9a3f00cf5f794 100755 --- a/yang-models/_3gpp-nr-nrm-eutranetwork.yang +++ b/yang-models/_3gpp-nr-nrm-eutranetwork.yang @@ -3,61 +3,34 @@ module _3gpp-nr-nrm-eutranetwork { namespace "urn:3gpp:sa5:_3gpp-nr-nrm-eutranetwork"; prefix "eutranet3gpp"; - import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the EUtraNetwork Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } - revision 2019-06-17 { - description "Initial revision"; - } - - feature ExternalsUnderEUtraNetwork { - description "Classes representing external entities like EUtranFrequency, - ExternalENBFunction are contained under a EUtraNetwork list/class."; - } + revision 2019-06-17 {reference "Initial revision"; } grouping EUtraNetworkGrp { - description "Represents the EUtraNetwork IOC."; - reference "3GPP TS 28.541"; - uses subnet3gpp:SubNetworkGrp; + description "Represents the EUtraNetwork IOC. + Contains no additiona attributes."; } - list EUtraNetwork { - description "A subnetwork containing gNB external E-UTRAN entities."; - reference "3GPP TS 28.541"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses EUtraNetworkGrp; - leaf-list parents { - description "Reference to all containg EUtraNetwork instances - in strict order from the root EUtraNetwork down to the immediate - parent EUtraNetwork. - If EUtraNetworks form a containment hierarchy this is - modeled using references between the child EUtraNetwork and the parent - EUtraNetworks. - This reference MUST NOT be present for the top level EUtraNetwork and - MUST be present for other EUtraNetworks."; - type leafref { - path "../../../EUtraNetwork/id"; - } - } - - leaf-list containedChildren{ - description "Reference to all directly contained EUtraNetwork instances. - If EUtraNetworks form a containment hierarchy this is - modeled using references between the child EUtraNetwork and the parent - EUtraNetwork."; - type leafref { - path "../../../EUtraNetwork/id"; - } + augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction { + list EUtraNetwork { + description "A subnetwork containing gNB external E-UTRAN entities."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses EUtraNetworkGrp; } } } diff --git a/yang-models/_3gpp-nr-nrm-eutranfrequency.yang b/yang-models/_3gpp-nr-nrm-eutranfrequency.yang index 0698485b4d510c123828444091ff53f079338b02..70508b134f6e24b19f192b3983a54914a32745fa 100755 --- a/yang-models/_3gpp-nr-nrm-eutranfrequency.yang +++ b/yang-models/_3gpp-nr-nrm-eutranfrequency.yang @@ -3,29 +3,29 @@ module _3gpp-nr-nrm-eutranfrequency { namespace "urn:3gpp:sa5:_3gpp-nr-nrm-eutranfrequency"; prefix "eutraneteutranfreq3gpp"; - import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the EUtranFrequency Information Object Class (IOC), that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM), 3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping EUtranFrequencyGrp { description "Represents the EUtranFrequency IOC."; reference "3GPP TS 28.541"; - uses mf3gpp:ManagedFunctionGrp; leaf earfcnDL { description "Specifies the channel number for the central DL frequency."; @@ -51,17 +51,25 @@ module _3gpp-nr-nrm-eutranfrequency { container attributes { uses EUtranFrequencyGrp; } - uses mf3gpp:ManagedFunctionContainedClasses; } } + feature EUtranFrequencyUnderSubNetwork { + description "The EUtranFrequency shall be contained under SubNetwork"; + } + augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; - uses EUtranFrequencyWrapper ; + if-feature EUtranFrequencyUnderSubNetwork ; + uses EUtranFrequencyWrapper; } - augment "/eutranet3gpp:EUtraNetwork" { - if-feature eutranet3gpp:ExternalsUnderEUtraNetwork; - uses EUtranFrequencyWrapper ; + feature EUtranFrequencyUnderEUtraNetwork { + description "The EUtranFrequency shall be contained under EUtraNetwork"; + } + + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + "eutranet3gpp:EUtraNetwork" { + if-feature EUtranFrequencyUnderEUtraNetwork; + uses EUtranFrequencyWrapper; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalamffunction.yang b/yang-models/_3gpp-nr-nrm-externalamffunction.yang index eb0547390186355c4379e44eddf9611bc6261a95..f74c5d3a04d2f8dff5681cf01171c453b171b841 100755 --- a/yang-models/_3gpp-nr-nrm-externalamffunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalamffunction.yang @@ -5,26 +5,24 @@ module _3gpp-nr-nrm-externalamffunction { import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } - import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the ExternalAMFFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalAMFFunctionGrp { description "Represents the ExternalAMFFunction IOC."; - reference "3GPP TS 28.541"; uses mf3gpp:ManagedFunctionGrp; list pLMNIdList { @@ -61,12 +59,6 @@ module _3gpp-nr-nrm-externalamffunction { } augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; - uses ExternalAMFFunctionWrapper; - } - - augment "/nrnet3gpp:NRNetwork" { - if-feature nrnet3gpp:ExternalsUnderNRNetwork; uses ExternalAMFFunctionWrapper; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalenbfunction.yang b/yang-models/_3gpp-nr-nrm-externalenbfunction.yang index cdb1611c40bfeef76913b9d245199f854106b9e8..ed8cb66832f6c068cba0ba5258f5109c486d0196 100755 --- a/yang-models/_3gpp-nr-nrm-externalenbfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalenbfunction.yang @@ -4,24 +4,27 @@ module _3gpp-nr-nrm-externalenbfunction { prefix "extenb3gpp"; import _3gpp-common-managed-function { prefix mf3gpp; } - import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } + import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; } + import _3gpp-nr-nrm-externaleutrancell { prefix exteutrancell3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the ExternalENBFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM), 3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalENBFunctionGrp { description "Represets the ExternalENBFunction IOC."; @@ -48,16 +51,29 @@ module _3gpp-nr-nrm-externalenbfunction { uses ExternalENBFunctionGrp; } uses mf3gpp:ManagedFunctionContainedClasses; + uses exteutrancell3gpp:ExternalEUtranCellFDDSubtree; + uses exteutrancell3gpp:ExternalEUtranCellTDDSubtree; } } + feature ExternalENBFunctionUnderSubNetwork { + description "The ExternalENBFunction shall be contained under + SubNetwork"; + } + augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; + if-feature ExternalENBFunctionUnderSubNetwork ; uses ExternalENBFunctionWrapper; } - augment "/eutranet3gpp:EUtraNetwork" { - if-feature eutranet3gpp:ExternalsUnderEUtraNetwork; + feature ExternalENBFunctionUnderEUtraNetwork { + description "The ExternalENBFunction shall be contained under + EUtraNetwork"; + } + + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + "eutranet3gpp:EUtraNetwork" { + if-feature ExternalENBFunctionUnderEUtraNetwork; uses ExternalENBFunctionWrapper; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externaleutrancell.yang b/yang-models/_3gpp-nr-nrm-externaleutrancell.yang index d3306bc8ce628b5ba38d3da3b088a107eb79e759..2a5ff1f39515f21ae4a634cd8d394992f85b5b65 100755 --- a/yang-models/_3gpp-nr-nrm-externaleutrancell.yang +++ b/yang-models/_3gpp-nr-nrm-externaleutrancell.yang @@ -5,25 +5,22 @@ module _3gpp-nr-nrm-externaleutrancell { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } - import _3gpp-common-subnetwork { prefix subnet3gpp; } - import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; } - import _3gpp-nr-nrm-externalenbfunction { prefix extenb3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the ExternalEUtranCellFDD and ExternalEUtranCellTDD Information Object Classes (IOCs) that are part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM), 3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalEUtranGenericCellGrp { description "Represents the ExternalEUtranGenericCell IOC."; @@ -106,7 +103,7 @@ module _3gpp-nr-nrm-externaleutrancell { } } - grouping ExternalEUtranCellFDDWrapper { + grouping ExternalEUtranCellFDDSubtree { list ExternalEUtranCellFDD { description "Represents the common properties of external E-UTRAN FDD cell provided by eNB or NG-RAN FDD cell provided by ng-eNB."; @@ -120,7 +117,7 @@ module _3gpp-nr-nrm-externaleutrancell { } } - grouping ExternalEUtranCellTDDWrapper { + grouping ExternalEUtranCellTDDSubtree { list ExternalEUtranCellTDD { description "Represents the common properties of external E-UTRAN cell TDD provided by eNB or NG-RAN TDD cell provided by ng-eNB."; @@ -133,24 +130,4 @@ module _3gpp-nr-nrm-externaleutrancell { uses mf3gpp:ManagedFunctionContainedClasses; } } - - augment "/subnet3gpp:SubNetwork/extenb3gpp:ExternalENBFunction" { - if-feature subnet3gpp:ExternalsUnderSubNetwork; - uses ExternalEUtranCellFDDWrapper; - } - - augment "/eutranet3gpp:EUtraNetwork/extenb3gpp:ExternalENBFunction" { - if-feature eutranet3gpp:ExternalsUnderEUtraNetwork; - uses ExternalEUtranCellFDDWrapper; - } - - augment "/subnet3gpp:SubNetwork/extenb3gpp:ExternalENBFunction" { - if-feature subnet3gpp:ExternalsUnderSubNetwork; - uses ExternalEUtranCellTDDWrapper; - } - - augment "/eutranet3gpp:EUtraNetwork/extenb3gpp:ExternalENBFunction" { - if-feature eutranet3gpp:ExternalsUnderEUtraNetwork; - uses ExternalEUtranCellTDDWrapper; - } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang index cbe2baff36c7f3b994d3bba7fc306ba78fdcffe8..b32301bdec55ad3c0d0c4656f9ea1822f03682ea 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang @@ -5,40 +5,44 @@ module _3gpp-nr-nrm-externalgnbcucpfunction { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-nr-nrm-externalnrcellcu { prefix extnrcellcu3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the ExternalGNBCUCPFunction Information Object Class (IOC), that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalGNBCUCPFunctionGrp { description "Represets the ExternalGNBCUCPFunction IOC."; - reference "3GPP TS 28.541"; uses mf3gpp:ManagedFunctionGrp; leaf gNBId { - description "Identifies a gNB within a PLMN."; - reference "gNB Identifier (gNB ID) in 3GPP TS 38.300, Global gNB ID - in 3GPP TS 38.413"; + description "Identifies a gNB within a PLMN. + The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells. + + See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. + See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; mandatory true; - type int64 { range "0..4294967295"; } + type uint32 { range "0..4294967295"; } } leaf gNBIdLength { description "Indicates the number of bits for encoding the gNB ID."; - reference "gNB ID in 3GPP TS 38.300, Global gNB ID in 3GPP TS 38.413"; + reference "'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; mandatory true; type int32 { range "22..32"; } } @@ -57,23 +61,35 @@ module _3gpp-nr-nrm-externalgnbcucpfunction { list ExternalGNBCUCPFunction { description "Represents the properties, known by the management function, of a GNBCUCPFunction managed by another management function."; - reference "3GPP TS 28.541"; key id; uses top3gpp:Top_Grp; container attributes { uses ExternalGNBCUCPFunctionGrp; } uses mf3gpp:ManagedFunctionContainedClasses; + + uses extnrcellcu3gpp:ExternalNRCellCUSubtree; } } - augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; - uses ExternalGNBCUCPFunctionWrapper; + feature ExternalGNBCUCPFunctionUnderNRNetwork { + description "The ExternalGNBCUCPFunction shall be contained under + NRNetwork"; } - augment "/nrnet3gpp:NRNetwork" { - if-feature nrnet3gpp:ExternalsUnderNRNetwork; + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + "nrnet3gpp:NRNetwork" { + if-feature ExternalGNBCUCPFunctionUnderNRNetwork; uses ExternalGNBCUCPFunctionWrapper; } + + feature ExternalGNBCUCPFunctionUnderSubNetwork { + description "The ExternalGNBCUCPFunction shall be contained under + SubNetwork"; + } + + augment "/subnet3gpp:SubNetwork" { + if-feature ExternalGNBCUCPFunctionUnderSubNetwork ; + uses ExternalGNBCUCPFunctionWrapper; + } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang index 2445a1e995bf8ac8fe4ae2145ddfe9f36b00d91a..7948b9167aee69567692a8b8da7a1f83874cdb48 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang @@ -4,11 +4,14 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { prefix "extgnbcuup3gpp"; import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the ExternalGNBCUUPFunction Information Object Class (IOC), that is part of the NR Network Resource Model (NRM). @@ -16,11 +19,10 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalGNBCUUPFunctionGrp { description "Represets the ExternalGNBCUUPFunction IOC."; @@ -28,26 +30,27 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { uses mf3gpp:ManagedFunctionGrp; leaf gNBId { - description "Identifies a gNB within a PLMN."; - reference "gNB Identifier (gNB ID) in 3GPP TS 38.300, Global gNB ID - in 3GPP TS 38.413"; + description "Identifies a gNB within a PLMN. + The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells. + + See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. + See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; mandatory true; - type int64 { range "0..4294967295"; } + type uint32 { range "0..4294967295"; } } leaf gNBIdLength { description "Indicates the number of bits for encoding the gNB ID."; - reference "gNB ID in 3GPP TS 38.300, Global gNB ID in 3GPP TS 38.413"; + reference "'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; mandatory true; type int32 { range "22..32"; } } } - grouping ExternalGNBCUUPFunctionWrapper { + grouping ExternalGNBCUUPFunctionSubtree { list ExternalGNBCUUPFunction { description "Represents the properties, known by the management function, of a GNBCUUPFunction managed by another management function."; - reference "3GPP TS 28.541"; key id; uses top3gpp:Top_Grp; container attributes { @@ -57,13 +60,24 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { } } - augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; - uses ExternalGNBCUUPFunctionWrapper; + feature ExternalGNBCUUPFunctionUnderNRNetwork { + description "The ExternalGNBCUUPFunction shall be contained under + NRNetwork"; + } + + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + "nrnet3gpp:NRNetwork" { + if-feature ExternalGNBCUUPFunctionUnderNRNetwork; + uses ExternalGNBCUUPFunctionSubtree; } - augment "/nrnet3gpp:NRNetwork" { - if-feature nrnet3gpp:ExternalsUnderNRNetwork; - uses ExternalGNBCUUPFunctionWrapper; + feature ExternalGNBCUUPFunctionUnderSubNetwork { + description "The ExternalGNBCUUPFunction shall be contained under + SubNetwork"; + } + + augment "/subnet3gpp:SubNetwork" { + if-feature ExternalGNBCUUPFunctionUnderSubNetwork ; + uses ExternalGNBCUUPFunctionSubtree; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang index 064b98db336c5bbe6ad0461a2471b7841836c192..e8dc9d6c699bbe7332aa565800d52d72b82f55e4 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang @@ -3,26 +3,27 @@ module _3gpp-nr-nrm-externalgnbdufunction { namespace "urn:3gpp:sa5:_3gpp-nr-nrm-externalgnbdufunction"; prefix "extgnbdu3gpp"; - import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the ExternalGNBDUFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalGNBDUFunctionGrp { description "Represets the ExternalGNBDUFunction IOC."; @@ -30,36 +31,28 @@ module _3gpp-nr-nrm-externalgnbdufunction { uses mf3gpp:ManagedFunctionGrp; leaf gNBId { - description "Identifies a gNB within a PLMN."; - reference "gNB Identifier (gNB ID) in 3GPP TS 38.300, Global gNB ID - in 3GPP TS 38.413"; + description "Identifies a gNB within a PLMN. + The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells. + + See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. + See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; mandatory true; - type int64 { range "0..4294967295"; } + type uint32 { range "0..4294967295"; } yext3gpp:inVariant; } leaf gNBIdLength { description "Indicates the number of bits for encoding the gNB ID."; - reference "gNB ID in 3GPP TS 38.300, Global gNB ID in 3GPP TS 38.413"; + reference "'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; mandatory true; type int32 { range "22..32"; } } - - list pLMNId { - description "Specifies the PLMN identifier to be used as part of the - global RAN node identity."; - key "mcc mnc"; - min-elements 1; - max-elements 1; - uses types3gpp:PLMNId; - } } - grouping ExternalGNBDUFunctionWrapper { + grouping ExternalGNBDUFunctionSubtree { list ExternalGNBDUFunction { description "Represents the properties, known by the management function, of a GNBDUFunction managed by another management function."; - reference "3GPP TS 28.541"; key id; uses top3gpp:Top_Grp; container attributes { @@ -69,13 +62,24 @@ module _3gpp-nr-nrm-externalgnbdufunction { } } - augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; - uses ExternalGNBDUFunctionWrapper; + feature ExternalGNBDUFunctionUnderNRNetwork { + description "The ExternalGNBDUFunction shall be contained under + NRNetwork"; } - augment "/nrnet3gpp:NRNetwork" { - if-feature nrnet3gpp:ExternalsUnderNRNetwork; - uses ExternalGNBDUFunctionWrapper; + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + "nrnet3gpp:NRNetwork" { + if-feature ExternalGNBDUFunctionUnderNRNetwork; + uses ExternalGNBDUFunctionSubtree; + } + + feature ExternalGNBDUFunctionUnderSubNetwork { + description "The ExternalGNBDUFunction shall be contained under + SubNetwork"; + } + + augment "/subnet3gpp:SubNetwork" { + if-feature ExternalGNBDUFunctionUnderSubNetwork ; + uses ExternalGNBDUFunctionSubtree; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang b/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang index b982aa12c22630a011a87fca72060d1b8f1b7a14..94ec2b7c74dd5f8dae82ae032b602e31eacfb83e 100755 --- a/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang +++ b/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang @@ -5,43 +5,57 @@ module _3gpp-nr-nrm-externalnrcellcu { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } - import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } - import _3gpp-common-subnetwork { prefix subnet3gpp; } - import _3gpp-nr-nrm-externalgnbcucpfunction { prefix extgnbcucp3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the ExternalNRCellCU Information Object Class (IOC), that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalNRCellCUGrp { description "Represents the ExternalNRCellCU IOC."; - reference "3GPP TS 28.541"; uses mf3gpp:ManagedFunctionGrp; leaf cellLocalId { - description "Identifies an NR cell of a gNB. Together with corresponding - gNB ID it forms the NR Cell Identifier (NCI)."; - reference "NCI in 3GPP TS 38.300"; + description "It identifies a NR cell of a gNB. + + It, together with the gNB Identifier (using gNBId of the parent + GNBCUCPFunction or GNBDUFunction or OperatorDU (for MOCN network + sharing scenario) or ExternalCUCPFunction), identifies a NR cell within + a PLMN. This is the NR Cell Identity(NCI). See subclause 8.2 of TS38.300. + + The NCI can be constructed by encoding the gNB Identifier using gNBId + (of the parent GNBCUCPFunction or GNBDUFunction or OperatorDU + (for MOCN network sharing scenario) or ExternalCUCPFunction) and + cellLocalId where the gNB Identifier field is of length specified by + gNBIdLength (of the parent GNBCUCPFunction or GNBDUFunction or + ExternalCUCPFunction). See 'Global gNB ID' in subclause 9.3.1.6 of + TS 38.413. + + The NR Cell Global identifier (NCGI) is constructed from the + PLMN identity the cell belongs to and the NR Cell Identifier (NCI) of + the cell. + + See relation between NCI and NCGI subclause 8.2 of TS 38.300 "; mandatory true; - type int32 {range "0..16383"; } + type int32; } leaf nRPCI { - description "The Physical Cell Identity (PCI) of the NR cell."; - reference "3GPP TS 36.211"; + description "This holds the Physical Cell Identity (PCI) of the NR cell. + + allowedValues: + See 3GPP TS 36.211 subclause 6.11 for legal values of pci."; mandatory true; - type int32 { range "0..1007"; } + type int64; } list pLMNIdList { @@ -62,11 +76,11 @@ module _3gpp-nr-nrm-externalnrcellcu { } } - grouping ExternalNRCellCUWrapper { + grouping ExternalNRCellCUSubtree { list ExternalNRCellCU { - description "Represents the properties of an NRCellCU controlled by - another Management Service Provider."; - reference "3GPP TS 28.541"; + description "This IOC contains necessary attributes for inter-system + and intra-system handover. It also contains a subset of the attributes + of related IOCs controlled by Management Service Provider."; key id; uses top3gpp:Top_Grp; container attributes { @@ -75,14 +89,4 @@ module _3gpp-nr-nrm-externalnrcellcu { uses mf3gpp:ManagedFunctionContainedClasses; } } - - augment "/subnet3gpp:SubNetwork/extgnbcucp3gpp:ExternalGNBCUCPFunction" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; - uses ExternalNRCellCUWrapper; - } - - augment "/nrnet3gpp:NRNetwork/extgnbcucp3gpp:ExternalGNBCUCPFunction" { - if-feature nrnet3gpp:ExternalsUnderNRNetwork; - uses ExternalNRCellCUWrapper; - } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang b/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang index 1fd0469466dae9b8d194c519dc61134194860835..dcaba95b49fb25b777e10125119b57e98f4cf51f 100755 --- a/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang @@ -4,8 +4,7 @@ module _3gpp-nr-nrm-externalservinggwfunction { prefix "extservgw3gpp"; import _3gpp-common-managed-function { prefix mf3gpp; } - import _3gpp-common-subnetwork { prefix subnet3gpp; } - import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; } + //import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; @@ -16,6 +15,7 @@ module _3gpp-nr-nrm-externalservinggwfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { @@ -43,7 +43,7 @@ module _3gpp-nr-nrm-externalservinggwfunction { } } - augment "/subnet3gpp:SubNetwork" { + /*augment "/subnet3gpp:SubNetwork" { if-feature subnet3gpp:ExternalsUnderSubNetwork ; uses ExternalServingGWFunctionWrapper; } @@ -51,5 +51,5 @@ module _3gpp-nr-nrm-externalservinggwfunction { augment "/eutranet3gpp:EUtraNetwork" { if-feature eutranet3gpp:ExternalsUnderEUtraNetwork; uses ExternalServingGWFunctionWrapper; - } + }*/ } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalupffunction.yang b/yang-models/_3gpp-nr-nrm-externalupffunction.yang index 11e924daba44be7b0889f63b3befdccbc203581a..abe82b6c8b8a94ce6ea40a68d490758ec14da36d 100755 --- a/yang-models/_3gpp-nr-nrm-externalupffunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalupffunction.yang @@ -4,17 +4,19 @@ module _3gpp-nr-nrm-externalupffunction { prefix "extupf3gpp"; import _3gpp-common-managed-function { prefix mf3gpp; } - import _3gpp-common-subnetwork { prefix subnet3gpp; } - import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } + /*import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; }*/ import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the ExternalUPFFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { @@ -42,7 +44,7 @@ module _3gpp-nr-nrm-externalupffunction { } } - augment "/subnet3gpp:SubNetwork" { + /*augment "/subnet3gpp:SubNetwork" { if-feature subnet3gpp:ExternalsUnderSubNetwork ; uses ExternalUPFFunctionWrapper; } @@ -50,5 +52,5 @@ module _3gpp-nr-nrm-externalupffunction { augment "/nrnet3gpp:NRNetwork" { if-feature nrnet3gpp:ExternalsUnderNRNetwork; uses ExternalUPFFunctionWrapper; - } + }*/ } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 7d8eabeec81675750634464c98f6e60d59175eb2..e8ce1c9f80f469a9bf5e96400a7a2c1b46ea9a9d 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -19,6 +19,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-08-12 { reference CR-1336 ; } revision 2024-05-24 { reference CR-1273 ; } revision 2024-04-04 { reference CR-1139; } revision 2024-02-24 { reference CR-1218; } @@ -180,6 +181,13 @@ module _3gpp-nr-nrm-gnbcucpfunction { type types3gpp:DistinguishedName; description "This is the DN of EphemerisInfoSet."; } + + leaf nRECMappingRuleRef { + type types3gpp:DistinguishedName; + description "DN of a NRECMappingRule. An empty value indicates the + NRECMappingRule contained by parent, e.g. ManagedElement or + SubNetwork, applies."; + } } grouping QceIdMappingInfoGrp { @@ -223,4 +231,4 @@ module _3gpp-nr-nrm-gnbcucpfunction { } } } -} \ No newline at end of file +} diff --git a/yang-models/_3gpp-nr-nrm-nrfrequency.yang b/yang-models/_3gpp-nr-nrm-nrfrequency.yang index a1589ef2b62eabd841a264bd4504c0fad8ccefd1..bd045b52d19a16b42e9779d4680fb790c392baf9 100755 --- a/yang-models/_3gpp-nr-nrm-nrfrequency.yang +++ b/yang-models/_3gpp-nr-nrm-nrfrequency.yang @@ -1,30 +1,29 @@ module _3gpp-nr-nrm-nrfrequency { yang-version 1.1; - namespace "urn:3gpp:sa5:_3gpp-nr-nrm-nrnetwork-nrfrequency"; + namespace "urn:3gpp:sa5:_3gpp-nr-nrm-nrfrequency"; prefix "nrfreq3gpp"; - import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the NRFrequency Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527"; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial version"; } grouping NRFrequencyGrp { description "Represents the NRFrequency IOC."; - reference "3GPP TS 28.541"; - uses mf3gpp:ManagedFunctionGrp; leaf absoluteFrequencySSB { description "The absolute frequency applicable for a downlink NR carrier @@ -33,18 +32,20 @@ module _3gpp-nr-nrm-nrfrequency { type uint32 { range "0.. 3279165"; } } - leaf sSBSubCarrierSpacing { - description "Sub-carrier spacing of the SSB."; + leaf ssBSubCarrierSpacing { + description "Sub-carrier spacing of the SSB. + Note that the allowed values of SSB used for representing data, + by e.g. a BWP, are: 15, 30, 60 and 120 in units of kHz."; mandatory true; - type uint8 { range "15 | 30 | 60 | 120"; } + type uint8 { range "15 | 30 | 60 | 120 | 240"; } units "kHz"; } - leaf-list multiFrequencyBandListNR { + leaf multiFrequencyBandListNR { description "List of additional frequency bands the frequency belongs to. The list is automatically set by the gNB."; + mandatory true; config false; - min-elements 0; type uint16 { range "1..256"; } } } @@ -52,23 +53,30 @@ module _3gpp-nr-nrm-nrfrequency { grouping NRFrequencyWrapper { list NRFrequency { description "Represents certain NR frequency properties."; - reference "3GPP TS 28.541"; key id; uses top3gpp:Top_Grp; container attributes { uses NRFrequencyGrp; } - uses mf3gpp:ManagedFunctionContainedClasses; } } - augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; + feature NRFrequencyUnderNRNetwork { + description "NRFrequency shall be contained under NRNetwork"; + } + + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + "nrnet3gpp:NRNetwork" { + if-feature NRFrequencyUnderNRNetwork; uses NRFrequencyWrapper; } - augment "/nrnet3gpp:NRNetwork" { - if-feature nrnet3gpp:ExternalsUnderNRNetwork; + feature NRFrequencyUnderSubNetwork { + description "NRFrequency shall be contained under SubNetwork"; + } + + augment "/subnet3gpp:SubNetwork" { + if-feature NRFrequencyUnderSubNetwork; uses NRFrequencyWrapper; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-nrnetwork.yang b/yang-models/_3gpp-nr-nrm-nrnetwork.yang index 9e622884df55a0e936c5935124d5140dbb28bb0c..044c2d0db83e2bedc3a58e62ecef87d855e71d50 100755 --- a/yang-models/_3gpp-nr-nrm-nrnetwork.yang +++ b/yang-models/_3gpp-nr-nrm-nrnetwork.yang @@ -3,40 +3,37 @@ module _3gpp-nr-nrm-nrnetwork { namespace "urn:3gpp:sa5:_3gpp-nr-nrm-nrnetwork"; prefix "nrnet3gpp"; - import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the NRNetwork Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common r17, r18 revision 2023-09-18 { reference CR-1043 ; } - revision 2019-06-17 { - description "Initial revision"; - } - - feature ExternalsUnderNRNetwork { - description "Classes representing external entities like NRFrequency, - ExternalGNBCUCPFunction, ExternalGNBDUFunction - are contained under a NRNetwork list/class."; - } + revision 2019-06-17 { reference "Initial revision"; } grouping NRNetworkGrp { - description "Represents the NRNetwork IOC."; - reference "3GPP TS 28.541"; - uses subnet3gpp:SubNetworkGrp; + description "Represents the NRNetwork IOC. + Contains no additiona attributes."; } - list NRNetwork { - description "A subnetwork containing gNB external NR entities."; - reference "3GPP TS 28.541"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses NRNetworkGrp; + augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction { + list NRNetwork { + description "Represents a set of NR frequencies and external NR entities + (e.g. ExternalGNBCUCPFunction). This is used to differentiate these + entities and frequencies from those in EUTRAN."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses NRNetworkGrp; + } } } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang b/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang index 42afcf2489a71eb8583c5e31cc9d296579c25d65..b4d490fbbfc32cd8b8b1e0834aeb27d2bac84672 100755 --- a/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang +++ b/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang @@ -14,10 +14,11 @@ module _3gpp-nr-nrm-nroperatorcelldu { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the OperatorDU Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-05-06 { reference "CR-1526 CR-1527" ; } // common for R18, R19 revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2021-10-01 { reference "Initial revision"; } @@ -79,7 +80,6 @@ module _3gpp-nr-nrm-nroperatorcelldu { container attributes { uses NROperatorCellDUGrp; } - uses gnbdu3gpp:GNBDUFunctionGrp; } } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-operatordu.yang b/yang-models/_3gpp-nr-nrm-operatordu.yang index 98a702b779dc1e9c00928f3dbd927c7d365f2865..f50f7873aebb50b82796e1e65ba17994da3c8beb 100755 --- a/yang-models/_3gpp-nr-nrm-operatordu.yang +++ b/yang-models/_3gpp-nr-nrm-operatordu.yang @@ -7,15 +7,17 @@ module _3gpp-nr-nrm-operatordu { import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-nr-nrm-gnbdufunction {prefix gnbdu3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-nr-nrm-ep { prefix ep3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the OperatorDU Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-05-06 { reference "CR-1526 CR-1527" ; } // common for R18, R19 revision 2024-02-24 { reference CR-1218; } revision 2023-11-14 { reference "CR1136"; } revision 2023-09-30 { reference "CR1048"; } @@ -76,7 +78,14 @@ module _3gpp-nr-nrm-operatordu { container attributes { uses OperatorDUGrp; } - uses gnbdu3gpp:GNBDUFunctionGrp; + + uses ep3gpp:EP_F1CSubtree { + refine EP_F1C { + max-elements 1; + } + } + + uses ep3gpp:EP_F1USubtree; } } } \ No newline at end of file diff --git a/yang-models/_3gpp-ns-nrm-serviceprofile.yang b/yang-models/_3gpp-ns-nrm-serviceprofile.yang index 190bc24e0f2280e446f4b45e5f44f33ed42220ee..c4a18084eaa2be3ccc5da6bc528c655ee8b94e39 100755 --- a/yang-models/_3gpp-ns-nrm-serviceprofile.yang +++ b/yang-models/_3gpp-ns-nrm-serviceprofile.yang @@ -3,14 +3,13 @@ submodule _3gpp-ns-nrm-serviceprofile { belongs-to _3gpp-ns-nrm-networkslice { prefix ns3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } - import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-ns-nrm-common { prefix ns3cmn; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "A network slice instance in a 5G network. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 Management and orchestration; @@ -18,6 +17,7 @@ submodule _3gpp-ns-nrm-serviceprofile { Information model definitions for network slice NRM (chapter 6) "; + revision 2025-08-18 { reference CR-1557; } revision 2023-09-18 { reference CR-1043 ; } revision 2020-06-02 { reference "CR-0485, CR-0508"; @@ -70,7 +70,7 @@ submodule _3gpp-ns-nrm-serviceprofile { description "Synthetic index for the element."; type uint32; } - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } list pLMNIdList { diff --git a/yang-models/_3gpp-ns-nrm-sliceprofile.yang b/yang-models/_3gpp-ns-nrm-sliceprofile.yang index 8745dd815c46bb79dc4cffde7069b1fa53c853c0..d3617e32633cea9a95d5f0d3ed077cbc0b128c2d 100755 --- a/yang-models/_3gpp-ns-nrm-sliceprofile.yang +++ b/yang-models/_3gpp-ns-nrm-sliceprofile.yang @@ -3,7 +3,6 @@ submodule _3gpp-ns-nrm-sliceprofile { belongs-to _3gpp-ns-nrm-networkslicesubnet { prefix nss3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } - import _3gpp-5g-common-yang-types { prefix types5g3gpp; } // import _3gpp-ns-nrm-networkslice { prefix ns3gpp; } import _3gpp-ns-nrm-common { prefix ns3cmn3gpp; } @@ -13,7 +12,7 @@ submodule _3gpp-ns-nrm-sliceprofile { description "Represents the properties of network slice subnet related requirement that should be supported by the network slice subnet instance in a 5G network. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 Management and orchestration; @@ -21,6 +20,7 @@ submodule _3gpp-ns-nrm-sliceprofile { Information model definitions for network slice NRM (chapter 6) "; + revision 2025-08-18 { reference CR-1557; } revision 2023-11-04 { reference CR-1129; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } @@ -959,7 +959,7 @@ submodule _3gpp-ns-nrm-sliceprofile { description "Synthetic index for the element."; type uint32; } - uses types5g3gpp:SNssai; + uses types3gpp:SNssai; } list pLMNIdList {