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..5e24d900043bc63d68516f06f5aef2b6e30261b8 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: @@ -348,9 +365,6 @@ components: attributes: allOf: - type: object - oneOf: - - required: [ requestStatus, mLModelToTestRef ] - - required: [ requestStatus, mLModelCoordinationGroupToTestRef ] properties: requestStatus: $ref: '#/components/schemas/RequestStatus' @@ -358,9 +372,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 +423,7 @@ components: - type: object properties: aIMLInferenceName: - type: string + $ref: '#/components/schemas/AIMLInferenceName' policyForLoading: $ref: '#/components/schemas/AIMLManagementPolicy' mLModelRef: @@ -448,7 +462,7 @@ components: mLModelId: type: string aIMLInferenceName: - type: string + $ref: '#/components/schemas/AIMLInferenceName' mLModelVersion: type: string expectedRunTimeContext: @@ -458,7 +472,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 +483,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 +562,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 +575,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 +596,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 +620,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 +650,7 @@ components: items: $ref: '#/components/schemas/InferenceOutput' minItems: 1 - mLModelRef: + mLModelRefList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' AIMLInferenceEmulationFunction-Single: @@ -639,7 +663,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/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/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 116dfc4b7d44bcd8df8eafb2f94fadb728a982fa..ce913eb9a874ba4ebf6a211379ac9ff5cb2742c8 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Provisioning MnS - version: 18.3.0 + version: 18.5.0 description: >- OAS 3.0.1 definition of the Provisioning MnS © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -219,7 +219,7 @@ paths: are targeted. required: false schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexConditions' - name: attributes in: query description: >- @@ -251,7 +251,10 @@ paths: select data nodes. required: false schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter' + oneOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionBasic' + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionAdvanced' + responses: '200': description: >- diff --git a/OpenAPI/TS28536_CoslaNrm.yaml b/OpenAPI/TS28536_CoslaNrm.yaml index a81e08261fc6cd845e072718fccae9bdee4553ce..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..c231b37d57dea7f9ddae893b3c7e8e6ad4683cda 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.11.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 @@ -2281,14 +2291,14 @@ components: description: globally identification of an NG-RAN node type: object oneOf: - - required: [ pLmnId, n3IwfId] - - required: [ plmnId, gNbId] - - required: [ pLmnId, ngeNbId] - - required: [ plmnId, wagfId] - - required: [ pLmnId, tngfId] - - required: [ plmnId, twifId] + - required: [ pLMNId, n3IwfId] + - required: [ plMNId, gNbId] + - required: [ pLMNId, ngeNbId] + - required: [ plMNId, wagfId] + - required: [ pLMNId, tngfId] + - required: [ plMNId, twifId] properties: - pLmnId: + pLMNId: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' n3IwfId: type: string @@ -2307,7 +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 @@ -3030,10 +3073,6 @@ components: $ref: '#/components/schemas/AmfIdentifier' sBIFqdn: type: string - interPlmnFQDN: - type: string - weightFactor: - $ref: '#/components/schemas/WeightFactor' cNSIIdList: $ref: '#/components/schemas/CNSIIdList' amfSetRef: @@ -3042,8 +3081,10 @@ 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: @@ -3077,8 +3118,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 +3562,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 +4308,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 +4488,7 @@ components: allOf: - type: object properties: - FiveQiDscpMappingList: + fiveQiDscpMappingList: type: array items: $ref: '#/components/schemas/FiveQiDscpMapping' @@ -4576,6 +4617,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 +4691,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 +5313,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 +5607,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 +5896,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..f724f144b0d7278874c5c72f16b1f93416ea0f1e 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.11.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: @@ -759,7 +727,8 @@ components: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' CCOFunction: $ref: '#/components/schemas/CCOFunction-Single' - + NTNFunction: + $ref: '#/components/schemas/NTNFunction-Single' ManagedElement-ncO-NrNrm: type: object properties: @@ -787,6 +756,8 @@ components: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Configurable5QISet-Multiple' Dynamic5QISet: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' + NTNFunction: + $ref: '#/components/schemas/NTNFunction-Single' #-------- Definition of abstract IOCs -------------------------------------------- @@ -945,12 +916,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 +940,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 +971,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 +1081,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: @@ -1169,7 +1148,7 @@ components: type: integer minimum: 0 maximum: 3279165 - ssbSubCarrierSpacing: + sSBSubCarrierSpacing: $ref: '#/components/schemas/SsbSubCarrierSpacing' multiFrequencyBandListNR: type: integer @@ -1331,7 +1310,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 +1351,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 +1422,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 +1704,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 +1787,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' @@ -2031,6 +2052,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 +2226,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 +2244,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 +2297,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..6a51002c7c66f53f2beb16fd29f44f7902c467ed 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.10.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: >- 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..c0e76d70c2c28c4d87a2310390d9bf972c7f4dbe 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Generic NRM - version: 18.7.0 + version: 18.9.0 description: >- OAS 3.0.1 definition of the Generic NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -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 @@ -250,23 +234,23 @@ components: timer: type: integer AreaScope: - oneOf: - - type: array - items: - $ref: '#/components/schemas/EutraCellId' - - type: array - items: - $ref: '#/components/schemas/NrCellId' - - type: array - items: - $ref: '#/components/schemas/Tac' - - type: array - items: - $ref: '#/components/schemas/Tai' + allOf: - type: array items: $ref: '#/components/schemas/NpnId-Type' - + - 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' 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..8d3a24b0a0c99f71e8bb8a5b2a577949ba8b511f 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Trace Control NRM - version: 18.7.0 + version: 18.9.0 description: >- OAS 3.0.1 definition of the Trace Control NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -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,6 +1354,7 @@ components: type: array items: $ref: '#/components/schemas/MbsfnArea' + maxItems: 8 reportType: $ref: '#/components/schemas/reportType-Type' plmnList: @@ -1355,7 +1362,10 @@ components: 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,7 +1380,7 @@ components: areaScope: type: array items: - $ref: '#/components/schemas/AreaScope' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/AreaScope' sensorInformation: $ref: '#/components/schemas/sensorInformation-Type' immediateMDTConfig: @@ -1383,7 +1393,9 @@ components: 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..75786fb27af3923b91782746359c9cd448eb42fc 100755 --- a/yang-models/_3gpp-5g-common-yang-types.yang +++ b/yang-models/_3gpp-5g-common-yang-types.yang @@ -3,7 +3,6 @@ module _3gpp-5g-common-yang-types { namespace "urn:3gpp:sa5:_3gpp-5g-common-yang-types"; prefix "types5g3gpp"; - import ietf-yang-types { prefix yang; } import _3gpp-common-yang-types { prefix types3gpp; } @@ -15,6 +14,7 @@ module _3gpp-5g-common-yang-types { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + 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 +22,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 diff --git a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang index b649d0bb05624c621681a5cba540ca8c095ce24a..58ece735b655411f76a9c28422358c38268e97bd 100755 --- a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang @@ -126,7 +126,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..a4724bf4e5e3b7468f1fcbd3ad4f352b12b1595e 100755 --- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang @@ -122,7 +122,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..b28a1a52179696bd6ca57b02c45a3c4d303cf8a2 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -8,7 +8,10 @@ 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; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -17,16 +20,16 @@ module _3gpp-5gc-nrm-amffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-10-06 { reference CR-1389; } revision 2024-04-04 { reference CR-1139; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-01-07 { reference CR-0643; } revision 2020-11-06 { reference CR-0412 ; } revision 2019-10-25 { reference "S5-194457 S5-193518"; } - revision 2019-05-31 { reference "Ericsson refactoring."; } revision 2018-08-07 { reference "Initial revision"; } - - grouping GlobalRanNodeIDGrp{ + + grouping NTNGlobalRanNodeIDGrp{ list pLMNId { description "The PLMN Identifier is composed of @@ -116,14 +119,13 @@ module _3gpp-5gc-nrm-amffunction { } } - grouping satelliteBackhaulInfo{ + grouping SatelliteBackhaulInfoGrp{ description "Defines information related to satellite backhaul category and corresponding information of gNB."; reference "3GPP TS 23.501"; - list GlobalRanNodeID{ + list nTNGlobalRanNodeID{ description "Unique identifier of an NG-RAN node."; - uses GlobalRanNodeIDGrp; min-elements 1; max-elements 1; leaf GlobalRanNodeIDValue{ @@ -131,6 +133,7 @@ module _3gpp-5gc-nrm-amffunction { description "this relies on the choice of GlobalRanNodeID"; } key "GlobalRanNodeIDValue"; + uses NTNGlobalRanNodeIDGrp; } leaf satelliteBackhaulCategory{ @@ -160,20 +163,309 @@ module _3gpp-5gc-nrm-amffunction { } } + grouping GUAMInfoGrp { + description "Represents the GUAMInfo datatype."; + + list pLMNId { + description "This attribute represents a PLMN Identity."; + min-elements 1; + max-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses types3gpp:PLMNId ; + } + + leaf aMFIdentifier { + type int64; + description "The AMFI is constructed from an AMF Region ID, an + AMF Set ID and an AMF Pointer. The AMF Region ID identifies the region, + the AMF Set ID uniquely identifies the AMF Set within the AMF Region, + and the AMF Pointer uniquely identifies the AMF within the AMF Set. + (Ref. 3GPP TS 23.003)"; + } + } + + grouping N2InterfaceAmfInfoGrp { + description "Represents the N2InterfaceAmfInfo datatype."; + + leaf-list ipv4EndpointAddress { + type inet:ipv4-address; + min-elements 1; + description "This attribute represents available AMF endpoint + IPv4 address(es) for N2."; + } + + leaf-list ipv6EndpointAddress { + type inet:ipv6-address; + min-elements 1; + description "This attribute represents available AMF endpoint + IPv6 address(es) for N2."; + } + + leaf amfName { + type inet:host-name; + description "This attribute represents AMF Name FQDN as defined in + clause 28.3.2.5 of TS 23.003."; + } + } + + grouping BlockedLocationInfoGrp { + description "Repreasents the datatype BlockedLocationInfo"; + + list blockedLocation { + description "This provides the geographical location at which the PLMN + are not allowed in case of NTN."; + min-elements 1; + max-elements 1; + key "mnc mcc"; + uses types3gpp:PLMNId ; + } + + list blockedDurWindow { + description "This provides the time durations for which the PLMN are + not allowed at a given location in case of NTN"; + key idx; + leaf idx { type uint32 ; } + uses types3gpp:TimeWindowGrp; + } + + list blockedSlice { + description "This provides the slice for which the access is + not allowed at a given location in case of NTN. "; + max-elements 1; + key idx; + unique "sst sd"; + leaf idx { type uint32; } + uses types5g3gpp:SNssai; + } + } + + grouping NTNPLMNRestrictionsInfoGrp { + description "Represents the datatype NTNPLMNRestrictionsInfo"; + + list pLMNId { + description "This attribute represents a PLMN Identity."; + min-elements 1; + max-elements 1; + key "mnc mcc"; + uses types3gpp:PLMNId ; + } + + list blockedLocationInfoList { + description "This defines the information related with the location + for which the access restrictions are to be applied in case of NTN."; + key "idx"; + leaf idx { type uint32 ; } + uses BlockedLocationInfoGrp; + } + } + + grouping NtnLocationInfoGrp { + description "Represents the NtnLocationInfo datatype."; + + list location { + description "This defines the Location (geographical area) under + consideration to which the satellite coverage info belongs"; + key idx; + leaf idx { type uint32 ; } + uses types3gpp:GeoAreaGrp; + } + + list availabilityWindows { + description "This attribute defines the list of time windows at which + the satellite coverage will be available for this location. + Either availabilityWindows or nonAvailabilityWindows shall be present."; + key idx; + leaf idx { type uint32 ; } + uses types3gpp:TimeWindowGrp; + } + + list nonAvailabilityWindows { + description "This attribute defines the list of time windows at which + the satellite coverage will not be available for this location. + Either availabilityWindows or nonAvailabilityWindows shall be present."; + key idx; + leaf idx { type uint32 ; } + uses types3gpp:TimeWindowGrp; + } + } + + grouping SatelliteCoverageInfoGrp { + description "Represents the datatype SatelliteCoverageInfo"; + + leaf nRSatelliteRATtype { + type enumeration { + enum NRLEO; + enum NRMEO; + enum NRGEO; + enum NROTHERSAT; + } + description "This attribute defines the RAT Type for NR satellite + access."; + } + + list locationInfo { + description "This attribute defines the information about location and + corresponding time windows for which the satellite coverage will be + available or unavailable."; + key idx; + leaf idx { type uint32 ; } + uses NtnLocationInfoGrp; + } + } + + grouping SliceExpiryInfoGrp { + description "Represents the datatype SliceExpiryInfo"; + + list pLMNInfo { + min-elements 1; // ??? + config false; + description "It defines the PLMN(s) of a Network Function. "; + key idx; + leaf idx { type uint32 ; } + uses types5g3gpp:PLMNInfo; + } + + leaf expiryTime { + type yang:date-and-time; + config false; + description "This attribute provides information about the time at + which the slice is scheduled to be expired as it is not required + anymore. + This attribute will be set based on the sliceAvailability coming as + part of ServiceProfile."; + } + } + + grouping MappedCellIdInfoGrp { + description "Represents the datatype MappedCellIdInfo"; + + list ntnGeoArea { + description "This attribute indicates a specific geographical location + mapped to Mapped Cell ID(s)."; + min-elements 1; + max-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses types3gpp:GeoAreaGrp; + } + + list mappedCellId { + description "This attribute is in format of NCGI to indicate a fixed + geographical area (See subclause 16.14.5 in TS 38.300"; + min-elements 1; + max-elements 1; + key "idx"; + leaf idx { type uint32 ; } + uses types5g3gpp:NcgiGrp; + } + } + + grouping AmfInfoGrp { + description "Represents the data type AmfInfo."; + + leaf amfRegionId { + type int64; + mandatory true; + description "It represents the AMF Region ID, which identifies the + region. AllowedValues: defined in subclause 2.10.1 of 3GPP TS 23.003 "; + } + + leaf amfSetId { + type int64; + mandatory true; + description "It represents the AMF Set ID, which is uniquely identifies + the AMF Set within the AMF Region. + allowedValues: defined in subclause 2.10.1 of 3GPP TS 23.003"; + } + + list taiList { + min-elements 1; + description "The list of TAIs."; + key "idx"; + leaf idx { type uint32 ; } + uses 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,15 +477,14 @@ module _3gpp-5gc-nrm-amffunction { type inet:domain-name; } - list sNSSAIList { - min-elements 1; - description "List of S-NSSAIs the managed object is capable of supporting. - (Single Network Slice Selection Assistance Information) - An S-NSSAI has an SST (Slice/Service type) and an optional SD - (Slice Differentiator) field."; - reference "3GPP TS 23.003"; - key "sd sst"; - uses types5g3gpp:SNssai; + leaf-list cNSIIdList { + type string; + description "It is a set of NSI ID. NSI ID is an identifier for + identifying the Core Network part of a Network Slice instance when + multiple Network Slice instances of the same Network Slice are deployed, + and there is a need to differentiate between them in the 5GC. + See NSI ID definition in clause 3.1 of TS 23.501 and + subclause 6.1.6.2.7 of TS 29.531"; } list managedNFProfile { @@ -213,6 +504,39 @@ module _3gpp-5gc-nrm-amffunction { uses types5g3gpp:CommModel; } + list amfInfo { + max-elements 1; + description "This attribute represents information of an AMF + NF Instance."; + key "idx"; + leaf idx { type uint32 ; } + uses AmfInfoGrp; + } + + list nTNPLMNRestrictionsList { + description "This attribute defines the location restrictions per PLMN + that relates to non-terrestrial network access."; + key "idx"; + leaf idx { type uint32 ; } + uses NTNPLMNRestrictionsInfoGrp; + } + + list satelliteCoverageInfoList { + description "This attribute defines the information related to NR + Satellite RAT type and corresponding information of satellite coverage"; + key "idx"; + leaf idx { type uint32 ; } + uses SatelliteCoverageInfoGrp; + } + + list sliceExpiryInfo { + description "This provides information related to a network slice + validity."; + key "idx"; + leaf idx { type uint32 ; } + uses SliceExpiryInfoGrp; + } + list satelliteBackhaulInfoList{ description "Specifies a list of satellite backhaul information. It can be used by NF and NF services."; @@ -222,7 +546,7 @@ module _3gpp-5gc-nrm-amffunction { } key "GlobalRanNodeIDValue"; min-elements 1; - uses satelliteBackhaulInfo; + uses SatelliteBackhaulInfoGrp; } leaf-list mdtUserConsentReqList { @@ -243,12 +567,30 @@ module _3gpp-5gc-nrm-amffunction { Any MDT measurement, whose name is not specified in this list, is not subject to user consent at MDT activation."; } + + list mappedCellIdInfoList { + description "It provides the list of mapping between GEO area and + Mapped Cell ID."; + key "idx"; + leaf idx { type uint32 ; } + uses MappedCellIdInfoGrp; + } + + leaf aMFSetRef { + type types3gpp:DistinguishedName; + description "This is the DN of AMFSet"; + } } augment "/me3gpp:ManagedElement" { list AMFFunction { - description "5G Core AMF Function"; - reference "3GPP TS 28.541"; + description "This IOC represents the AMF functionality in 5GC. + For more information about the AMF, see 3GPP TS 23.501. + + The attribute sliceExpiryInfo is used when the validity information of + a network slice need to be configured. The attribute + sliceExpiryInfo.pLMNInfo indicates the network slice to which the + validity information applies."; key id; uses top3gpp:Top_Grp; container attributes { diff --git a/yang-models/_3gpp-5gc-nrm-anlffunction.yang b/yang-models/_3gpp-5gc-nrm-anlffunction.yang index 85673a4c7815f90dfe0f892352e1ee94b186ea80..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-nwdaffunction.yang b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang index 5fe7eb7ae142767122d471d1be5edf12e3fed2bf..a5256f4c745a525022cda8b95b9a94592bb6c3bc 100755 --- a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang @@ -21,6 +21,7 @@ module _3gpp-5gc-nrm-nwdaffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2024-08-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; } @@ -279,7 +280,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 { @@ -319,8 +321,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 +396,4 @@ module _3gpp-5gc-nrm-nwdaffunction { uses mf3gpp:ManagedFunctionContainedClasses; } } -} \ No newline at end of file +} diff --git a/yang-models/_3gpp-common-filemanagement.yang b/yang-models/_3gpp-common-filemanagement.yang index 1e03291afae984f4b8f63e2155f954999b59d817..d9b5afa663bd2a523b1d14319f6660f8d4aa57fb 100644 --- a/yang-models/_3gpp-common-filemanagement.yang +++ b/yang-models/_3gpp-common-filemanagement.yang @@ -8,6 +8,7 @@ module _3gpp-common-filemanagement { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } + import ietf-inet-types { prefix inet; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -17,6 +18,7 @@ module _3gpp-common-filemanagement { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM)"; + revision 2024-11-07 { reference CR-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-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index 233aa6f4a2ab338201ffe86eab7eb0c679110085..eaa8dbdb7299fffaca6582635278c176603e04be 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -12,6 +12,7 @@ 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"; @@ -33,6 +34,7 @@ module _3gpp-common-managed-element { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + 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 +51,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"; @@ -142,6 +148,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 +311,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-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..e04577d77215145d5189fa5c2ac227a57bf6882d 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -44,7 +44,7 @@ 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, + 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,9 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; + 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,13 +95,8 @@ 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."; @@ -187,6 +185,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 +194,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 +205,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,7 +244,7 @@ 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; @@ -278,11 +275,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)."; diff --git a/yang-models/_3gpp-common-mecontext.yang b/yang-models/_3gpp-common-mecontext.yang new file mode 100644 index 0000000000000000000000000000000000000000..ed183f1a72c8e880e788732bdd3edac15487e6f5 --- /dev/null +++ b/yang-models/_3gpp-common-mecontext.yang @@ -0,0 +1,82 @@ +module _3gpp-common-mecontext { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-common-mecontext"; + prefix "mectx3gpp"; + + import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-top { prefix top3gpp; } + import _3gpp-common-subnetwork { prefix subnet3gpp; } + import ietf-yang-schema-mount { prefix yangmnt; } + + organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + + description "Defines basic MeContext which will be augmented by other IOCs + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.623 + Generic Network Resource Model (NRM) + Integration Reference Point (IRP); + Solution Set (SS) definitions + + 3GPP TS 28.622 + Generic Network Resource Model (NRM) + Integration Reference Point (IRP); + Information Service (IS)"; + + revision 2024-07-17 { reference "CR-0381 CR-0382 CR-0383"; } + + grouping MeContextGrp { + description "Represents the MeContext IOC."; + + leaf dnPrefix { + type types3gpp:DistinguishedName; + description "It carries the DN Prefix information or no information. + The instance of MeContext is the local root instance of the MIB. + Otherwise the attribute shall be absent or carry no information."; + reference "Annex C of 32.300 "; + } + } + + augment "/subnet3gpp:SubNetwork" { + list Mecontext { + description "This IOC is introduced for naming purposes. It may support + creation of unique DNs in scenarios when some MEs have the same RDNs due + to the fact that they have been manufacturer pre-configured. + + If some MEs have the same RDNs (for the above mentioned reason) and they + are contained in the same SubNetwork instance, some measure shall be + taken in order to assure the global uniqueness of DNs for all IOC + instances under those MEs. One way could be to set different dnPrefix + for those NEs, but that would require either that: + + a) all LDNs or DNs are locally modified using the new dnPrefix for the + upper portion of the DNs, or + b) a mapping (translation) of the old LDNs or DNs to the new DNs every + time they are used externally, e.g. in alarm notifications. + + As both the two alternatives above may involve unacceptable drawbacks + (as the old RDNs for the MEs then would have to be changed or mapped to + new values), using MeContext offers a new alternative to resolve the DN + creation. Using MeContext as part of the naming tree (and thus the DN) + means that the dnPrefix, including a unique MeContext for each ME, may + be directly concatenated with the LDNs, without any need to change or + map the existing ME RDNs to new values. + + MeContext have 0..N instances. It may exist even if no SubNetwork exists. + Every instance of MeContext contains exactly one ManagedElement during + steady-state operations."; + + key id; + uses top3gpp:Top_Grp; + container attributes { + uses MeContextGrp; + } + + yangmnt:mount-point children-of-MeContext { + description "Mountpoint for ManagedElement"; + reference "RFC8528 YANG Schema Mount"; + } + } + } +} \ No newline at end of file diff --git a/yang-models/_3gpp-common-qmcjob.yang b/yang-models/_3gpp-common-qmcjob.yang index bd46a03606da1467dab086579490ab72717290d9..9ae62e2144a9c410553de03eb57f14a0b269bcda 100644 --- a/yang-models/_3gpp-common-qmcjob.yang +++ b/yang-models/_3gpp-common-qmcjob.yang @@ -27,6 +27,7 @@ module _3gpp-common-qmcjob { Integration Reference Point (IRP); Information Service (IS)"; + 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; } @@ -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..23362b81d9bf722115ff9ed3202b9e1ce2c4d43a 100755 --- a/yang-models/_3gpp-common-subnetwork.yang +++ b/yang-models/_3gpp-common-subnetwork.yang @@ -13,6 +13,7 @@ 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"; @@ -33,6 +34,7 @@ module _3gpp-common-subnetwork { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + 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 +63,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"; @@ -269,6 +275,10 @@ module _3gpp-common-subnetwork { 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-trace.yang b/yang-models/_3gpp-common-trace.yang index af5327945e8450ecca88f1883152f8593ac64667..b19385705281ff2561c499abe8f407ad078e438b 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,11 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; + 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,20 +110,7 @@ module _3gpp-common-trace { grouping AreaScopeGrp { description "Represents the AreaScope dataType. - This <> defines the area scope of MDT. - The Area Scope parameter in LTE and NR is either: - - list of Cells, identified by E-UTRAN-CGI or NG-RAN CGI. - Maximum 32 CGI can be defined. - - list of Tracking Area, identified by TAC. - Maximum of 8 TAC can be defined. - - list of Tracking Area Identity, identified by TAC with - associated plmn-Identity perTAC-List containing the - PLMN identity for each TAC. Maximum of 8 TAI can be defined. - The Area Scope parameter in NR can also contain: - - list of NPN-IDs in NR. It is either a list of PNI-NPNs - identified by CAG ID with associated plmn-Identity or a - list of SNPNs identified by Network ID with associated - plmn-Identity ."; + This <> defines an area scope"; choice AreaScopeChoice { leaf-list eutraCellIdList { @@ -128,11 +120,11 @@ module _3gpp-common-trace { description "List of E-UTRAN cells identified by E-UTRAN-CGI"; } - leaf-list utraCellIdList { + leaf-list nrCellIdList { type string; min-elements 1; max-elements 32; - description "List of UTRAN cells identified by UTRAN CGI"; + description "List of NR cells identified by NG-RAN CGI"; } leaf-list tacList { @@ -153,9 +145,10 @@ module _3gpp-common-trace { } 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"; + description "It defines which NPNs that can be served by the NR cell, + and which CAG IDs or NIDs can be supported by the NR cell for + corresponding PNI-NPN or SNPN in case of the cell is NPN-only cell. + (NPN-Identity referring to TS 38.331)."; key idx; min-elements 1; uses NpnIdGrp; @@ -173,18 +166,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."; + } } } @@ -263,7 +263,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 +569,7 @@ module _3gpp-common-trace { } } - leaf-list listOfNETypes { + leaf-list listOfNeTypes { type enumeration { enum MSC_SERVER; enum SGSN; @@ -586,12 +586,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 +604,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 +789,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 +848,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 +861,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 +892,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 +909,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 +930,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 +948,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 +958,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 +971,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 +996,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 +1008,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 +1060,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 +1072,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 +1084,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 +1126,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 +1136,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 +1148,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 +1174,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 +1190,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 +1209,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 +1228,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 +1247,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 +1266,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 +1285,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 +1304,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 +1323,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 +1342,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 +1404,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 +1437,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 +1452,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 +1465,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 +1479,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,9 +1494,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, 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"; + eventListForEventTriggeredMeasurement is configured for L1 event."; + reference "clauses 5.10.38 of TS 32.422."; } list pLMNList { @@ -1394,10 +1505,10 @@ module _3gpp-common-trace { 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"; + reference "Clause 5.10.24 of 3GPP TS 32.422."; } - list areaConfigurationForNeighCells { + list areaConfigurationForNeighCell { when '../../../jobType = "LOGGED_MDT_ONLY"'; key "idx"; leaf idx { type uint32 ; } @@ -1407,7 +1518,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 +1530,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 +1550,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 +1560,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 +1587,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 +1602,55 @@ 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."; + } } - 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 +1666,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 +1696,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 +1715,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 +1730,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 +1739,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 +1751,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 ; @@ -1646,10 +1766,10 @@ module _3gpp-common-trace { 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 +1786,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 +1803,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 'NG-RAN_CELL' only in case of NR 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 either 'IMSI', 'IMEI' or + 'IMEISV' if the Trace Session is activated to any of the following ManagedEntity(ies): - HssFunction - MscServerFunction @@ -1698,29 +1825,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 +1881,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 +1890,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 +1908,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 +1963,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..e8bd963e1b98c392c1b151e0c49371b99b0c10a9 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -12,10 +12,12 @@ 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-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; } @@ -312,7 +314,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 +325,6 @@ module _3gpp-common-yang-types { type Longitude; mandatory true; } - - leaf altitude { - type Altitude; - } - } typedef OnOff { @@ -644,6 +641,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 +981,15 @@ 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'. As for CHOICE_1 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-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-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang new file mode 100644 index 0000000000000000000000000000000000000000..81519e61ceb2b979bafeee7c2006e6198e2ded5f --- /dev/null +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -0,0 +1,57 @@ +module _3gpp-nr-nrm-ecmappingrule { + yang-version 1.1; + namespace urn:3gpp:sa5:_3gpp-nr-nrm-ecmappingrule; + prefix ecmap3gpp; + + import _3gpp-common-top { prefix top3gpp; } + + organization "3gpp SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "This IOC represents the unified mapping rule input to support + Energy Cost Index Mapping when Energy Cost Reporting. + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.541"; + + revision 2024-08-12 { reference CR-1336 ; } + + 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 "The mapping rule."; + key id; + uses top3gpp:Top_Grp; + min-elements 1; + max-elements 1; + leaf idx { type uint32; } + container attributes { + uses NRECMappingRuleGrp; + } + } + } +} diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang index cbe2baff36c7f3b994d3bba7fc306ba78fdcffe8..6c295a4040a94b75fc73c9da68c6d208422733b4 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang @@ -76,4 +76,4 @@ module _3gpp-nr-nrm-externalgnbcucpfunction { if-feature nrnet3gpp:ExternalsUnderNRNetwork; uses ExternalGNBCUCPFunctionWrapper; } -} \ 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 +}