From 58452299d79b815c80b47f6eb795ef5ef1a60574 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 23 Aug 2024 10:48:48 +0000 Subject: [PATCH 001/157] TS28.623 Rel18 CR0388 correction to duplicate Scope definition and misalignment --- OpenAPI/TS28623_GenericNrm.yaml | 18 +------------- OpenAPI/TS28623_SubscriptionControlNrm.yaml | 27 ++++++++++++--------- 2 files changed, 17 insertions(+), 28 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 695a96fa4..0c23c94f0 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -201,23 +201,7 @@ 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. diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml index 5d4932626..6d41737a9 100644 --- a/OpenAPI/TS28623_SubscriptionControlNrm.yaml +++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml @@ -14,17 +14,22 @@ 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: + type: string #-------- Definition of concrete IOCs -------------------------------------------- NtfSubscriptionControl-Single: -- GitLab From c0a506da468c30411fe458a32aa997d9afbda29d Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 8 Aug 2024 03:21:53 +0000 Subject: [PATCH 002/157] TS28.105 Rel18 CR0153 correction to misalignment of stage 2 and stage 3 --- OpenAPI/TS28105_AiMlNrm.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 7566d90a2..f96300c01 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -348,9 +348,6 @@ components: attributes: allOf: - type: object - oneOf: - - required: [ requestStatus, mLModelToTestRef ] - - required: [ requestStatus, mLModelCoordinationGroupToTestRef ] properties: requestStatus: $ref: '#/components/schemas/RequestStatus' @@ -358,9 +355,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: @@ -555,6 +552,10 @@ components: properties: progressStatus: $ref: '#/components/schemas/ProcessMonitor' + cancelProcess: + type: boolean + suspendProcess: + type: boolean mLModelRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' mLUpdateRequestRef: -- GitLab From 369e67dd6a6d56c21e0703483b19f3a145177551 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 7 Aug 2024 09:28:25 +0000 Subject: [PATCH 003/157] TS28.541 Rel18 CR1299 correction to NFProfile_used_in_NRFFunction --- OpenAPI/TS28541_5GcNrm.yaml | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 44dc93e1c..9def2c033 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -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,10 +104,12 @@ components: type: array items: $ref: '#/components/schemas/IpEndPoint' - apiPrfix: + apiPrefix: type: string allowedPlmns: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' allowedNfTypes: type: array items: @@ -4637,8 +4645,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: -- GitLab From b0fc149eaf8429a05af9d95f1ffe7a1d0dd47a9b Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 7 Aug 2024 14:15:01 +0000 Subject: [PATCH 004/157] TR28.541 Rel18 CR1301 correction to attribute definintion to InterfaceUpfInfoItem_and_IpInterface --- OpenAPI/TS28541_5GcNrm.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 9def2c033..a36aae33c 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -820,9 +820,15 @@ components: type: object properties: ipv4EndpointAddresses: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' + minItems: 1 ipv6EndpointAddresses: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' + minItems: 1 fqdn: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' -- GitLab From cab75a869a13b897b7d6dbc32bd69d8eacc9a106 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 22 Aug 2024 20:39:52 +0000 Subject: [PATCH 005/157] Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index a36aae33c..c0b366c8c 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -823,12 +823,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' -- GitLab From 3cd1b5f2ccc6f277b14cfa5d2da2a07e00468d72 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 22 Aug 2024 20:49:55 +0000 Subject: [PATCH 006/157] Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index c0b366c8c..b116339c9 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -795,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: -- GitLab From af15ae9a3dbde73f3024e717ce23db7e036c3daa Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 23 Aug 2024 12:46:21 +0000 Subject: [PATCH 007/157] TS28.105 Rel18 CR0152 correction to attribute name of attribute related to... --- OpenAPI/TS28105_AiMlNrm.yaml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index f96300c01..8286323e8 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -464,6 +464,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: @@ -539,7 +543,7 @@ components: type: boolean mLUpdateProcessRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - mLModelRef: + mLModelRefList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' MLUpdateProcess-Single: @@ -556,9 +560,9 @@ components: type: boolean suspendProcess: type: boolean - mLModelRef: + 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' @@ -573,7 +577,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' @@ -597,7 +601,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 @@ -627,7 +631,7 @@ components: items: $ref: '#/components/schemas/InferenceOutput' minItems: 1 - mLModelRef: + mLModelRefList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' AIMLInferenceEmulationFunction-Single: -- GitLab From b7dffe2f66e1c3f2923bc587a424f57dde75182a Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Wed, 7 Aug 2024 15:11:09 +0000 Subject: [PATCH 008/157] Missing trace interfaces --- OpenAPI/TS28623_TraceControlNrm.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 0d09284e0..4cd32d314 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -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: @@ -556,6 +563,7 @@ components: - NetworkDeregistration - UEMobilityFromEPC - UEMobilityToEPC + - ConvergedChargingService SMF: type: array items: @@ -567,6 +575,9 @@ components: - PDUsessionUPactivationDeactivation - MobilityBtw3gppAndN3gppTo5GC - MobilityFromEpc + - MobilityBtwISMForVSMF + - ConvergedChargingService + - OfflineOnlyCharging PCF: type: array items: @@ -576,6 +587,7 @@ components: - SMpolicy - Authorization - BDTpolicy + - SpendingLimitControl UPF: type: array items: -- GitLab From fb506c2a50ade2041c7625906060cc19aa94c05d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 8 Aug 2024 08:35:39 +0000 Subject: [PATCH 009/157] Update file TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 62e23de93..9e124fe48 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -996,6 +996,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: @@ -1705,6 +1709,15 @@ 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-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1775,6 +1788,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' @@ -2203,6 +2225,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' -- GitLab From e2a28da68349bd2e72c6a321b43e4826c2a93dc3 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 8 Aug 2024 12:23:10 +0000 Subject: [PATCH 010/157] Update file TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 9e124fe48..8987ea7f5 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1106,9 +1106,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: -- GitLab From 8c57a711b4cf868b1838db41f3a55fb07494837e Mon Sep 17 00:00:00 2001 From: Shitao Li Date: Thu, 8 Aug 2024 07:40:43 +0000 Subject: [PATCH 011/157] Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index b116339c9..6a8bf74da 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3087,8 +3087,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: @@ -3531,8 +3531,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' @@ -4277,7 +4277,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 @@ -5559,10 +5559,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: @@ -5848,7 +5848,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' -- GitLab From 2b98a5b3cb11680a36e27e0d78969c1885604902 Mon Sep 17 00:00:00 2001 From: zhaoxxian Date: Wed, 7 Aug 2024 06:48:56 +0000 Subject: [PATCH 012/157] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 6a8bf74da..d7bc60034 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -2338,7 +2338,7 @@ components: blockedDur: $ref: '#/components/schemas/TimeDuration' blockedSlice: - type: string + type: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' TimeDuration: description: location for which the PLMN access restrictions are to be applied in case of NTN type: object -- GitLab From 227de96c5193e2924a1a0b3d6b2c32cec850888c Mon Sep 17 00:00:00 2001 From: zhaoxxian Date: Wed, 7 Aug 2024 07:07:53 +0000 Subject: [PATCH 013/157] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index d7bc60034..d243174d8 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -2338,7 +2338,7 @@ components: blockedDur: $ref: '#/components/schemas/TimeDuration' blockedSlice: - type: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' + $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' TimeDuration: description: location for which the PLMN access restrictions are to be applied in case of NTN type: object -- GitLab From c88d2b06174fa23eead115c1e30df4bd96c73f3d Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Fri, 9 Aug 2024 09:38:17 +0000 Subject: [PATCH 014/157] Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index d243174d8..837c96853 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -225,6 +225,8 @@ components: properties: nfInstanceID: type: string + interPlmnFqdn: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' nfType: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' heartbeatTimer: @@ -3040,8 +3042,6 @@ components: $ref: '#/components/schemas/AmfIdentifier' sBIFqdn: type: string - interPlmnFQDN: - type: string weightFactor: $ref: '#/components/schemas/WeightFactor' cNSIIdList: -- GitLab From 12105573ad3ac26d29cc35521a0173be66d52325 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Thu, 8 Aug 2024 07:42:05 +0000 Subject: [PATCH 015/157] Update TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 0c23c94f0..e1486035a 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -234,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: -- GitLab From 6da3eaa0d83818e0226e42edf092009a8ea0022c Mon Sep 17 00:00:00 2001 From: shixixi Date: Fri, 9 Aug 2024 09:16:29 +0000 Subject: [PATCH 016/157] Update TS28105_AiMlNrm.yaml --- OpenAPI/TS28105_AiMlNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 8286323e8..28252141c 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -644,7 +644,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' -- GitLab From c5d8d221ee158d573e6074baae058f61d78d2719 Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Wed, 31 Jul 2024 12:14:40 +0000 Subject: [PATCH 017/157] Added AssuranceReport reference to ACCL --- OpenAPI/TS28536_CoslaNrm.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/TS28536_CoslaNrm.yaml b/OpenAPI/TS28536_CoslaNrm.yaml index a81e08261..a64d44ece 100755 --- a/OpenAPI/TS28536_CoslaNrm.yaml +++ b/OpenAPI/TS28536_CoslaNrm.yaml @@ -156,6 +156,8 @@ components: $ref: '#/components/schemas/ControlLoopLifeCyclePhase' aCCLDisallowedList: $ref: '#/components/schemas/ACCLDisallowedAttributes' + AssuranceReport: + $ref: '#/components/schemas/AssuranceReport-Single' AssuranceGoal: $ref: '#/components/schemas/AssuranceGoal-Multiple' networkSliceRef: -- GitLab From 7ac96e4aa655a1b8c791fac536ae0e1f18036597 Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Thu, 1 Aug 2024 08:54:58 +0000 Subject: [PATCH 018/157] correct networkSliceRef and networkSliceSubnetRefUpdate --- OpenAPI/TS28536_CoslaNrm.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28536_CoslaNrm.yaml b/OpenAPI/TS28536_CoslaNrm.yaml index a64d44ece..e9f7576b3 100755 --- a/OpenAPI/TS28536_CoslaNrm.yaml +++ b/OpenAPI/TS28536_CoslaNrm.yaml @@ -156,14 +156,14 @@ components: $ref: '#/components/schemas/ControlLoopLifeCyclePhase' aCCLDisallowedList: $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: -- GitLab From d4eadae9aeb02c167eea4f0aea64714bacab4fee Mon Sep 17 00:00:00 2001 From: allwang Date: Wed, 7 Aug 2024 16:07:09 +0000 Subject: [PATCH 019/157] Update TS28623_TraceControlNrm.yaml --- OpenAPI/TS28623_TraceControlNrm.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 4cd32d314..040c8ea55 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -478,7 +478,7 @@ components: 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 @@ -737,7 +737,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, 5.10.13 and 5.10.14. type: object properties: EventThresholdRSRP: @@ -756,6 +756,10 @@ components: - type: integer minimum: 0 maximum: 127 + EventThresholdSINR: + type: integer + minimum: 0 + maximum: 127 EventThreshold1F: type: object properties: -- GitLab From 80f54a841c46be0340a27ac3be99a04592e96087 Mon Sep 17 00:00:00 2001 From: allwang Date: Wed, 7 Aug 2024 20:45:38 +0000 Subject: [PATCH 020/157] Update TS28623_TraceControlNrm.yaml --- OpenAPI/TS28623_TraceControlNrm.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 040c8ea55..10a81f9c0 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -737,7 +737,7 @@ components: - A2_EVENT eventThreshold-Type: - description: See details in 3GPP TS 32.422 clause 5.10.7, 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: @@ -758,8 +758,8 @@ components: maximum: 127 EventThresholdSINR: type: integer - minimum: 0 - maximum: 127 + minimum: 0 + maximum: 127 EventThreshold1F: type: object properties: @@ -888,7 +888,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: @@ -901,13 +901,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 @@ -964,7 +964,7 @@ components: - PathLoss eventThresholdUphUmts-Type: - description: See details in 3GPP TS 32.422 clause 5.10.A. + description: See details in 3GPP TS 32.422 clause 5.10.39. type: integer minimum: 0 maximum: 31 -- GitLab From 051ab07f5ff1b45784d157a6dd3d9cc404deccb3 Mon Sep 17 00:00:00 2001 From: allwang Date: Thu, 8 Aug 2024 11:43:21 +0000 Subject: [PATCH 021/157] Update TS28623_TraceControlNrm.yaml --- OpenAPI/TS28623_TraceControlNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 10a81f9c0..ac24edfc2 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -1229,7 +1229,7 @@ components: traceCollectionEntityId-Type: description: See details in 3GPP TS 32.422 clause 5.10.11. Only TCE Id value may be sent over the air to the UE being configured for Logged MDT. - type: integer + type: string excessPacketDelayThreshold-Type: description: Excess Packet Delay Threshold for NR MDT. See details in 3GPP TS 32.422 clause 4.1.1 and 4.1.2. -- GitLab From b229a7844e5e0931be6792bc4745d13f6cabc5af Mon Sep 17 00:00:00 2001 From: allwang Date: Thu, 8 Aug 2024 11:53:13 +0000 Subject: [PATCH 022/157] Update TS28623_TraceControlNrm.yaml --- OpenAPI/TS28623_TraceControlNrm.yaml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index ac24edfc2..a6ac263e6 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -406,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. @@ -439,10 +436,6 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc' traceId: type: string - required: - - mcc - - mnc - - traceId traceReportingFormat-Type: type: string @@ -472,9 +465,6 @@ components: - SUPI TargetIdValue: type: string - required: - - TargetIdType - - TargetIdValue triggeringEvents-Type: type: object @@ -979,9 +969,6 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc' mnc: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc' - required: - - mcc - - mnc maxItems: 16 positioningMethod-Type: -- GitLab From 54f1a03b31eaf6309b02af3c9bf27db638416d1b Mon Sep 17 00:00:00 2001 From: allwang Date: Thu, 8 Aug 2024 13:53:20 +0000 Subject: [PATCH 023/157] Update TS28623_TraceControlNrm.yaml --- OpenAPI/TS28623_TraceControlNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index a6ac263e6..05519d001 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -1216,7 +1216,7 @@ components: traceCollectionEntityId-Type: description: See details in 3GPP TS 32.422 clause 5.10.11. Only TCE Id value may be sent over the air to the UE being configured for Logged MDT. - type: string + type: integer excessPacketDelayThreshold-Type: description: Excess Packet Delay Threshold for NR MDT. See details in 3GPP TS 32.422 clause 4.1.1 and 4.1.2. -- GitLab From 70045f3caa0f05cd43ce79a7b97337b100554997 Mon Sep 17 00:00:00 2001 From: allwang Date: Tue, 6 Aug 2024 20:06:28 +0000 Subject: [PATCH 024/157] Update TS28623_TraceControlNrm.yaml --- OpenAPI/TS28623_TraceControlNrm.yaml | 60 ++++++++++++++-------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 4cd32d314..dacad3c8e 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -651,7 +651,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: @@ -666,7 +666,7 @@ components: - 10240ms - 60000ms - collectionPeriodM6Lte-Type: + collectionPeriodM6LTE-Type: description: See details in 3GPP TS 32.422 clause 5.10.32. type: string enum: @@ -675,13 +675,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: @@ -694,7 +694,7 @@ components: - 4000ms - 6000ms - collectionPeriodRrmNr-Type: + collectionPeriodRRMNR-Type: description: See details in 3GPP TS 32.422 clause 5.10.30. type: string enum: @@ -704,7 +704,7 @@ components: - 10240ms - 60000ms - collectionPeriodM6Nr-Type: + collectionPeriodM6NR-Type: description: See details in 3GPP TS 32.422 clause 5.10.34. type: string enum: @@ -723,7 +723,7 @@ components: - 12min - 30min - collectionPeriodM7Nr-Type: + collectionPeriodM7NR-Type: description: See details in 3GPP TS 32.422 clause 5.10.35. type: integer minimum: 1 @@ -923,7 +923,7 @@ components: - 2560ms - 5120ms - measurementPeriodLte-Type: + measurementPeriodLTE-Type: description: See details in 3GPP TS 32.422 clause 5.10.23. type: string enum: @@ -933,7 +933,7 @@ components: - 10240ms - 1min - measurementPeriodUmts-Type: + measurementPeriodUMTS-Type: description: See details in 3GPP TS 32.422 clause 5.10.22. type: string enum: @@ -959,7 +959,7 @@ components: - CPICH_RSCP - PathLoss - eventThresholdUphUmts-Type: + eventThresholdUphUMTS-Type: description: See details in 3GPP TS 32.422 clause 5.10.A. type: integer minimum: 0 @@ -1311,26 +1311,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: -- GitLab From 88343b3d970aa7d9d54bf04e4df9579ac34d12cc Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Mon, 5 Aug 2024 08:01:08 +0000 Subject: [PATCH 025/157] Update TS28541_5GcNrm.yaml 28.541_Rel18_CR_Correct_AIML_Associatons --- OpenAPI/TS28541_5GcNrm.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 837c96853..a4763c53e 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -5269,6 +5269,11 @@ 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' -- GitLab From 79caf4422c04977300b6a2c00491a2f67c7a8448 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Mon, 5 Aug 2024 08:10:40 +0000 Subject: [PATCH 026/157] Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index a4763c53e..325ddc2df 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -5269,11 +5269,10 @@ components: enum: - ACTIVATED - DEACTIVATED - mLModelRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - aIMLInferenceFunctionRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - + 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' -- GitLab From 8e4a189c872fba181378a442b62366d74d340167 Mon Sep 17 00:00:00 2001 From: allwang Date: Fri, 9 Aug 2024 15:22:35 +0000 Subject: [PATCH 027/157] Update TS28623_TraceControlNrm.yaml --- OpenAPI/TS28623_TraceControlNrm.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 36891a599..d887e9228 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -1216,7 +1216,7 @@ components: traceCollectionEntityId-Type: description: See details in 3GPP TS 32.422 clause 5.10.11. Only TCE Id value may be sent over the air to the UE being configured for Logged MDT. - type: integer + type: string excessPacketDelayThreshold-Type: description: Excess Packet Delay Threshold for NR MDT. See details in 3GPP TS 32.422 clause 4.1.1 and 4.1.2. @@ -1351,6 +1351,7 @@ components: type: array items: $ref: '#/components/schemas/MbsfnArea' + maxItems: 8 reportType: $ref: '#/components/schemas/reportType-Type' plmnList: @@ -1358,7 +1359,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: -- GitLab From 79ac15fe79663d6e3a84fb786bcf8f3ba05072d9 Mon Sep 17 00:00:00 2001 From: allwang Date: Wed, 21 Aug 2024 06:49:04 +0000 Subject: [PATCH 028/157] Update TS28623_TraceControlNrm.yaml --- OpenAPI/TS28623_TraceControlNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index d887e9228..88c5782dd 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -1216,7 +1216,7 @@ components: traceCollectionEntityId-Type: description: See details in 3GPP TS 32.422 clause 5.10.11. Only TCE Id value may be sent over the air to the UE being configured for Logged MDT. - type: string + type: integer excessPacketDelayThreshold-Type: description: Excess Packet Delay Threshold for NR MDT. See details in 3GPP TS 32.422 clause 4.1.1 and 4.1.2. -- GitLab From ed257be7e52bc09d775bf0b7f112a6cea4106a6f Mon Sep 17 00:00:00 2001 From: qiwen Date: Fri, 9 Aug 2024 17:18:41 +0000 Subject: [PATCH 029/157] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 325ddc2df..ad9cecb1e 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -4586,6 +4586,23 @@ components: type: integer qFMeasurementPeriod: type: integer + qFMonitoredSatelliteBackhaulCategories: + type: array + items: + $ref: '#/components/schemas/SatelliteBackhaulCategories' + + SatelliteBackhaulCategories: + type: string + description: any of enumerated value + enum: + - GEO + - MEO + - LEO + - OTHER_SAT + - DYNAMIC_GEO + - DYNAMIC_MEO + - DYNAMIC_LEO + - DYNAMIC_OTHER_SAT PredefinedPccRuleSet-Single: allOf: -- GitLab From 9782e922ea6f82fcd7cb4f0c0b0fbe6af476e273 Mon Sep 17 00:00:00 2001 From: qiwen Date: Wed, 21 Aug 2024 11:12:40 +0000 Subject: [PATCH 030/157] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index ad9cecb1e..5e812b21e 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -4595,10 +4595,6 @@ components: type: string description: any of enumerated value enum: - - GEO - - MEO - - LEO - - OTHER_SAT - DYNAMIC_GEO - DYNAMIC_MEO - DYNAMIC_LEO -- GitLab From 30e75f861223e8a5818b804efdf2d7ee9429d625 Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Thu, 1 Aug 2024 14:25:14 +0000 Subject: [PATCH 031/157] Fix stage 3 MDAFunction and Lists --- OpenAPI/TS28104_MdaNrm.yaml | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index c229cc7d8..2165d9cf3 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -107,6 +107,19 @@ components: format: float minimum: 0 + MLModelRefList: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + AIMLInferenceFunctionRefList: + type: array + items: + $ref: 'TS28623_ComDefs.yaml #/components/schemas/Dn' + + + + #-------- Definition of types for name-containments ------ SubNetwork-ncO-MdaNrm: type: object @@ -128,7 +141,7 @@ components: #-------- Definition of concrete IOCs -------------------------------------------- MDAFunction-Single: allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction' - type: object properties: attributes: @@ -138,15 +151,17 @@ components: properties: supportedMDACapabilities: $ref: '#/components/schemas/MDATypes' - mlModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - aIMLInferenceFunctionRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + mlModelRefList: + $ref: '#/components/schemas/MLModelRefList' + aIMLInferenceFunctionRefList: + $ref: '#/components/schemas/AIMLInferenceFunctionRefList' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object properties: MDARequest: $ref: '#/components/schemas/MDARequest-Multiple' + MDAReport: + $ref: '#/components/schemas/MDAReport-Multiple' MDARequest-Single: allOf: -- GitLab From 78455d16528836b617bb0f71b1b88f6ab07d3597 Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Thu, 1 Aug 2024 15:06:23 +0000 Subject: [PATCH 032/157] Update TS28104_MdaNrm.yaml --- OpenAPI/TS28104_MdaNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index 2165d9cf3..9cbfab510 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -115,7 +115,7 @@ components: AIMLInferenceFunctionRefList: type: array items: - $ref: 'TS28623_ComDefs.yaml #/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' -- GitLab From 2940a11ec0b9e6c67d8019a845c536cd2245251d Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Wed, 7 Aug 2024 11:49:30 +0000 Subject: [PATCH 033/157] Fix capitalization mLModel --- OpenAPI/TS28104_MdaNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index 9cbfab510..70b0bc25f 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -151,7 +151,7 @@ components: properties: supportedMDACapabilities: $ref: '#/components/schemas/MDATypes' - mlModelRefList: + mLModelRefList: $ref: '#/components/schemas/MLModelRefList' aIMLInferenceFunctionRefList: $ref: '#/components/schemas/AIMLInferenceFunctionRefList' -- GitLab From 4e38b8049c2947954fcf3961f3b1a75a24d31e73 Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Wed, 7 Aug 2024 13:21:57 +0000 Subject: [PATCH 034/157] Fixed ManagedFunction-nc0 --- OpenAPI/TS28104_MdaNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index 70b0bc25f..e7a122de2 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -141,7 +141,7 @@ components: #-------- Definition of concrete IOCs -------------------------------------------- MDAFunction-Single: allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-nc0' - type: object properties: attributes: -- GitLab From 358e154929fe3c398a128898d0df07d08a810b72 Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Wed, 7 Aug 2024 13:30:05 +0000 Subject: [PATCH 035/157] fix ncO --- OpenAPI/TS28104_MdaNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index e7a122de2..7b3fe58b4 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -141,7 +141,7 @@ components: #-------- Definition of concrete IOCs -------------------------------------------- MDAFunction-Single: allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-nc0' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: attributes: -- GitLab From 49fe49941b560a1999dde141f9fdfccbdfe0ed33 Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Fri, 9 Aug 2024 14:00:53 +0000 Subject: [PATCH 036/157] Updated to DnList --- OpenAPI/TS28104_MdaNrm.yaml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index 7b3fe58b4..2b290b7f9 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -107,18 +107,6 @@ components: format: float minimum: 0 - MLModelRefList: - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - - AIMLInferenceFunctionRefList: - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - - - #-------- Definition of types for name-containments ------ SubNetwork-ncO-MdaNrm: @@ -152,9 +140,9 @@ components: supportedMDACapabilities: $ref: '#/components/schemas/MDATypes' mLModelRefList: - $ref: '#/components/schemas/MLModelRefList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' aIMLInferenceFunctionRefList: - $ref: '#/components/schemas/AIMLInferenceFunctionRefList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object properties: -- GitLab From fbffb86d73afc1e79cb635062b311ac6cad76d5e Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Thu, 22 Aug 2024 17:12:24 +0000 Subject: [PATCH 037/157] Update TS28104_MdaNrm.yaml --- OpenAPI/TS28104_MdaNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index 2b290b7f9..c18f5df79 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -129,7 +129,7 @@ components: #-------- Definition of concrete IOCs -------------------------------------------- MDAFunction-Single: allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -143,7 +143,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' aIMLInferenceFunctionRefList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: MDARequest: -- GitLab From a7d3148952ca635e77f5d8a169e22106acdd3460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Fri, 9 Aug 2024 08:25:20 +0000 Subject: [PATCH 038/157] Update TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index dc5c4d4e4..c1aa692c5 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -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: >- -- GitLab From 167d03bf194fa8c89338a3ea0ad02113d95ba172 Mon Sep 17 00:00:00 2001 From: ayani Date: Thu, 25 Jul 2024 11:09:44 +0000 Subject: [PATCH 039/157] Update file TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 0848b77d4..20a018819 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -88,6 +88,15 @@ components: type: string swImageRef: type: string + RegistrationInfo: + type: object + properties: + registrationExpiry: + type: string + registrationID: + type: string + secCredential: + type: string Duration: type: object properties: @@ -205,6 +214,8 @@ components: type: array items: type: string + registrationInfo: + $ref: '#/components/schemas/RegistrationInfo' eASRequirementsRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' eASAddress: @@ -271,6 +282,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: -- GitLab From 30da5ba7dc9a1d2167e0c8372d90af0bf9b8b72b Mon Sep 17 00:00:00 2001 From: ayani Date: Fri, 26 Jul 2024 07:21:27 +0000 Subject: [PATCH 040/157] Update file TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 20a018819..f16ed7718 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -88,15 +88,15 @@ components: type: string swImageRef: type: string - RegistrationInfo: - type: object - properties: - registrationExpiry: - type: string - registrationID: - type: string - secCredential: - type: string + RegistrationInfo: + type: object + properties: + registrationExpiry: + type: string + registrationID: + type: string + secCredential: + type: string Duration: type: object properties: -- GitLab From a1e7d66d0c6d97f0bb0d2316317fae64d1b8139a Mon Sep 17 00:00:00 2001 From: ayani Date: Wed, 7 Aug 2024 12:39:41 +0000 Subject: [PATCH 041/157] Update file TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index f16ed7718..4dd6954d7 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -93,10 +93,13 @@ components: properties: registrationExpiry: type: string + readOnly: true registrationID: type: string + readOnly: true secCredential: type: string + readOnly: true Duration: type: object properties: -- GitLab From 953f28795b12237ba138f82581a72e9b67fd6255 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Thu, 22 Aug 2024 11:10:50 +0000 Subject: [PATCH 042/157] TS_28.538_Rel18_RegistrationInfo --- OpenAPI/TS28538_EdgeNrm.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 4dd6954d7..67d5ab969 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -99,7 +99,6 @@ components: readOnly: true secCredential: type: string - readOnly: true Duration: type: object properties: -- GitLab From 4fe3cfd3daefad27877ad29803eec4938457e0b2 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 4 Sep 2024 03:04:52 +0000 Subject: [PATCH 043/157] Code Moderator uupdate openAPI version --- OpenAPI/TS28104_MdaNrm.yaml | 2 +- OpenAPI/TS28105_AiMlNrm.yaml | 2 +- OpenAPI/TS28312_IntentNrm.yaml | 2 +- OpenAPI/TS28536_CoslaNrm.yaml | 2 +- OpenAPI/TS28538_EdgeNrm.yaml | 2 +- OpenAPI/TS28541_5GcNrm.yaml | 2 +- OpenAPI/TS28541_NrNrm.yaml | 2 +- OpenAPI/TS28623_GenericNrm.yaml | 2 +- OpenAPI/TS28623_SubscriptionControlNrm.yaml | 2 +- OpenAPI/TS28623_TraceControlNrm.yaml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index c18f5df79..4290465aa 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: MDA NRM - version: 18.4.0 + version: 18.5.0 description: >- OAS 3.0.1 specification of the MDA NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 28252141c..4bdb73a0e 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: AI/ML NRM - version: 18.4.0 + version: 18.5.0 description: >- OAS 3.0.1 specification of the AI/ML NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index c1aa692c5..3d018cb18 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.5.0 description: >- OAS 3.0.1 definition of the Intent NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28536_CoslaNrm.yaml b/OpenAPI/TS28536_CoslaNrm.yaml index e9f7576b3..54d2c5898 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.2.0 description: >- OAS 3.0.1 specification of the Cosla NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 67d5ab969..a87137ee0 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.8.0 description: >- OAS 3.0.1 specification of the Edge NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 5e812b21e..9ed184190 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP 5GC NRM - version: 18.8.0 + version: 18.9.0 description: >- OAS 3.0.1 specification of the 5GC NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 8987ea7f5..11e810bb7 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: NR NRM - version: 18.8.0 + version: 18.9.0 description: >- OAS 3.0.1 specification of the NR NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index e1486035a..081978338 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.8.0 description: >- OAS 3.0.1 definition of the Generic NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml index 6d41737a9..e808716e6 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.8.0 description: >- OAS 3.0.1 definition of the Subscription Control NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 88c5782dd..5806dc392 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.8.0 description: >- OAS 3.0.1 definition of the Trace Control NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From 9819a92633b81c4cdb6762b59a4df0b58925d001 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 7 Aug 2024 11:11:13 +0200 Subject: [PATCH 044/157] add MeContext; the file is the same in R17,18,19 --- yang-models/_3gpp-common-mecontext.yang | 82 +++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 yang-models/_3gpp-common-mecontext.yang diff --git a/yang-models/_3gpp-common-mecontext.yang b/yang-models/_3gpp-common-mecontext.yang new file mode 100644 index 000000000..ed183f1a7 --- /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 -- GitLab From 2ecf059928f873a88a09aa9902144daf6fc4225c Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 29 Jul 2024 13:31:26 +0200 Subject: [PATCH 045/157] Update description in ConditionMonitor --- yang-models/_3gpp-common-util.yang | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-common-util.yang b/yang-models/_3gpp-common-util.yang index 6e58aa14f..e5892c61a 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-xxxx; } 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."; } } -- GitLab From c29625d33d5cb12d70ded574cf4a4cd5e2922aee Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 8 Aug 2024 18:42:55 +0200 Subject: [PATCH 046/157] Update revision statement --- yang-models/_3gpp-common-util.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-util.yang b/yang-models/_3gpp-common-util.yang index e5892c61a..389f5db6e 100644 --- a/yang-models/_3gpp-common-util.yang +++ b/yang-models/_3gpp-common-util.yang @@ -17,7 +17,7 @@ module _3gpp-common-util { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623"; - revision 2024-07-30 { reference CR-xxxx; } + revision 2024-07-30 { reference "CR-0392 CR-0393"; } revision 2024-05-06 { reference CR-0359; } feature SchedulerUnderManagedElement { -- GitLab From 0bb025208714211266b8c653896697a8ff6d4e3f Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Mon, 8 Jul 2024 16:00:29 +0000 Subject: [PATCH 047/157] Update UE core level measurement --- yang-models/_3gpp-common-trace.yang | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index af5327945..d245ae25f 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -25,6 +25,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; + revision 2024-08-05 { reference "CR-xxxx"; } revision 2024-05-12 { reference "CR-0401"; } revision 2024-05-06 { reference CR-0359; } revision 2024-04-06 { reference "CR-0342"; } @@ -1521,20 +1522,20 @@ module _3gpp-common-trace { } } - grouping UEMeasConfigGrp { - description "Represents the UEMeasConfig dataType. + grouping UECoreMeasConfigGrp { + description "Represents the UECoreMeasConfig dataType. This <> defines the aconfiguration parameters of IOC TraceJob - which are specific for UE level measurements collection."; + 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."; + description "It specifies the List of 5GC UE level measurements."; } - leaf ueMeasGranularityPeriod { + leaf ueCoreMeasGranularityPeriod { type uint32; - description "It specifies the Granularity period used to produce UE level - measurements. The period is defined in milliseconds (ms)."; + description "It specifies the Granularity period used to produce 5GC UE + level measurements. The period is defined in milliseconds (ms)."; } leaf nfTypeToMeasure { @@ -1752,7 +1753,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 +1762,7 @@ module _3gpp-common-trace { key idx; description "5GC UE level measurements config"; max-elements 1; - uses UEMeasConfigGrp; + uses UECoreMeasConfigGrp; leaf idx { type string; } } @@ -1839,10 +1840,10 @@ module _3gpp-common-trace { only, RCEF reports only and Logged MBSFN MDT, the configuration parameters of attribute mdtConfig or a subset of these shall be applied. In case of UE measurements only, the configuration parameters - of attribute ueMeasConfig shall be applied. In case of any combination + of 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 - ueMeasConfig are applicable. + ueCoreMeasConfig are applicable. Creation and deletion of TraceJob instances by MnS consumers is optional; when not supported, the TraceJob instances may be created -- GitLab From bb442ccfbab1dce5cfd264316052548adb80070e Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Mon, 8 Jul 2024 16:10:34 +0000 Subject: [PATCH 048/157] Update file _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index d245ae25f..16ef43cee 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -1835,15 +1835,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 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. + 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 -- GitLab From 10d26571de7174394c47f84be387007369a9d0c3 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Mon, 5 Aug 2024 14:43:52 +0000 Subject: [PATCH 049/157] CR0376 --- yang-models/_3gpp-common-trace.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 16ef43cee..bd011b17f 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -25,7 +25,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; - revision 2024-08-05 { reference "CR-xxxx"; } + revision 2024-08-05 { reference "CR-0376"; } revision 2024-05-12 { reference "CR-0401"; } revision 2024-05-06 { reference CR-0359; } revision 2024-04-06 { reference "CR-0342"; } -- GitLab From a4503acb66643680c281318cdb7f71455592b5c8 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 16 Sep 2024 19:37:41 +0200 Subject: [PATCH 050/157] Local rebase and commit of MR1225 Rel18 28.623 CR 0378 correction on mdt configuration in mrdc --- yang-models/_3gpp-common-trace.yang | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index bd011b17f..bdc0528d9 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -25,7 +25,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; - revision 2024-08-05 { reference "CR-0376"; } + revision 2024-08-06 { reference "CR-0376 CR-0378"; } revision 2024-05-12 { reference "CR-0401"; } revision 2024-05-06 { reference CR-0359; } revision 2024-04-06 { reference "CR-0342"; } @@ -1520,6 +1520,15 @@ module _3gpp-common-trace { leaf idx { type string; } uses LoggedMdtConfigGrp; } + + leaf mNOnly { + type boolean; + default false; + description "Specifies whether the MDT configuration is for MN + only or not. The value FALSE means the MDT configuration is for + both MN and SN. The value TRUE means the MDT configuration is + for MN only."; + } } grouping UECoreMeasConfigGrp { -- GitLab From dccee35e8839ce8ed7c2019f25be6dfcf730ef0b Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 16 Sep 2024 19:46:00 +0200 Subject: [PATCH 051/157] Local rebase and commit of MR1279 Rel18_CR0420_TS_28.623_Correction_to_AreaScope_stage3 --- yang-models/_3gpp-common-trace.yang | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index bdc0528d9..bf194a6ea 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -25,7 +25,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; - revision 2024-08-06 { reference "CR-0376 CR-0378"; } + 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"; } @@ -106,20 +106,9 @@ 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 the area scope of MDT and QoE. + The Area Scope for MDT is specified in clause 5.10.2 of TS 32.422. + The Area Scope for QoE is specified in clause 5.4 of TS 28.405"; choice AreaScopeChoice { leaf-list eutraCellIdList { @@ -129,11 +118,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 { -- GitLab From ce5d5eb2510894ab9ca528c9611fb4f0029a491d Mon Sep 17 00:00:00 2001 From: qiwen Date: Fri, 9 Aug 2024 13:40:55 +0000 Subject: [PATCH 052/157] Update file _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang --- ...-5gc-nrm-GtpUPathQoSMonitoringControl.yang | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang index b649d0bb0..d1672c707 100755 --- a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang @@ -126,6 +126,28 @@ module _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl { delay for GTP-U path QoS monitoring."; 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 GEO; + enum MEO; + enum LEO; + enum OTHER_SAT; + enum DYNAMIC_GEO; + enum DYNAMIC_MEO; + enum DYNAMIC_LEO; + enum DYNAMIC_OTHER_SAT; + enum NON_SATELLITE; + } + } + } } augment "/me3gpp:ManagedElement/smf3gpp:SMFFunction" { -- GitLab From ab8899d4d6b4827440e03839d4ea83b22d1e683b Mon Sep 17 00:00:00 2001 From: qiwen Date: Fri, 9 Aug 2024 16:50:21 +0000 Subject: [PATCH 053/157] Update 2 files - /yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang - /yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang --- ...-5gc-nrm-GtpUPathQoSMonitoringControl.yang | 23 ------------------- .../_3gpp-5gc-nrm-QFQoSMonitoringControl.yang | 23 +++++++++++++++++++ 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang index d1672c707..de4714662 100755 --- a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang @@ -126,29 +126,6 @@ module _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl { delay for GTP-U path QoS monitoring."; 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 GEO; - enum MEO; - enum LEO; - enum OTHER_SAT; - enum DYNAMIC_GEO; - enum DYNAMIC_MEO; - enum DYNAMIC_LEO; - enum DYNAMIC_OTHER_SAT; - enum NON_SATELLITE; - } - } - } - } augment "/me3gpp:ManagedElement/smf3gpp:SMFFunction" { diff --git a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang index 3294c01f8..0fce7d456 100755 --- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang @@ -122,6 +122,29 @@ 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 GEO; + enum MEO; + enum LEO; + enum OTHER_SAT; + enum DYNAMIC_GEO; + enum DYNAMIC_MEO; + enum DYNAMIC_LEO; + enum DYNAMIC_OTHER_SAT; + enum NON_SATELLITE; + } + } + } + } } augment "/me3gpp:ManagedElement/smf3gpp:SMFFunction" { -- GitLab From 5447a79f584df10d899777553591b4c4e0a7a999 Mon Sep 17 00:00:00 2001 From: qiwen Date: Fri, 9 Aug 2024 16:51:28 +0000 Subject: [PATCH 054/157] Update file _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang --- yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang index de4714662..58ece735b 100755 --- a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang @@ -126,6 +126,7 @@ module _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl { delay for GTP-U path QoS monitoring."; type uint32; } + } augment "/me3gpp:ManagedElement/smf3gpp:SMFFunction" { -- GitLab From 95a750458c4ed50e7408ee44372929267b492afe Mon Sep 17 00:00:00 2001 From: qiwen Date: Fri, 9 Aug 2024 16:55:21 +0000 Subject: [PATCH 055/157] Update 2 files - /yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang - /yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang --- yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang | 1 - yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang index 58ece735b..de4714662 100755 --- a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang @@ -126,7 +126,6 @@ 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 0fce7d456..002cdede3 100755 --- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang @@ -145,7 +145,7 @@ in 3GPP TS 23.501. } } } - } + augment "/me3gpp:ManagedElement/smf3gpp:SMFFunction" { -- GitLab From 6eb830984b8f9bf06d45b6a4359716793f17c283 Mon Sep 17 00:00:00 2001 From: qiwen Date: Fri, 9 Aug 2024 16:58:13 +0000 Subject: [PATCH 056/157] Update file _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang --- yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang index de4714662..58ece735b 100755 --- a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang @@ -126,6 +126,7 @@ module _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl { delay for GTP-U path QoS monitoring."; type uint32; } + } augment "/me3gpp:ManagedElement/smf3gpp:SMFFunction" { -- GitLab From eb3d0044901defe5fc6f1f334a56c58c1ee5698b Mon Sep 17 00:00:00 2001 From: qiwen Date: Wed, 21 Aug 2024 11:22:35 +0000 Subject: [PATCH 057/157] Update file _3gpp-5gc-nrm-QFQoSMonitoringControl.yang --- yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang index 002cdede3..a4724bf4e 100755 --- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang @@ -124,23 +124,18 @@ in 3GPP TS 23.501. } list qFMonitoredSatelliteBackhaulCategories { - description "The satellite backhaul categories for which the QoS monitoring - per QoS flow per UE is to be performed."; + 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 GEO; - enum MEO; - enum LEO; - enum OTHER_SAT; enum DYNAMIC_GEO; enum DYNAMIC_MEO; enum DYNAMIC_LEO; enum DYNAMIC_OTHER_SAT; - enum NON_SATELLITE; } } } -- GitLab From 9341b03751b4dad6fe62a0fb9e082e9583e85342 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 14 Aug 2024 19:46:44 +0000 Subject: [PATCH 058/157] Add new file --- yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 95 ++++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 yang-models/_3gpp-nr-nrm-ecimappingrule.yang diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang new file mode 100644 index 000000000..cd7c67765 --- /dev/null +++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang @@ -0,0 +1,95 @@ +module _3gpp-5gc-nrm-ecimappingrule { + yang-version 1.1; + namespace urn:3gpp:sa5:_3gpp-5gc-nrm-ecimappingrule; + prefix ecimapping3gpp; + + import _3gpp-common-top { prefix top3gpp; } + import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-externalgnbcucpfunction {prefix gnbcucp3gpp; } + + 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 2023, 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 ECIMappingRuleInput { + description + "Input to the unified mapping rule to support ECI."; + reference "3GPP TS 28.541"; + + leaf eciMRInputMinimumValue { + type uint8; + description "The minimum value of to be applied + for mapping from this attribute to the energy cost."; + } + + leaf eciMRInputMaximumValue { + type uint8; + description "The maximum value of to be applied + for mapping from this attribute to the energy cost."; + } + + leaf eciTimeInterval { + 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."; + } + } + + grouping NGRANECIMappingRuleGrp { + description "Represents the NGRANECIMappingRule IOC."; + list dynamic5QIs { + description "This IOC represents a unified mapping rule."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses ECIMappingRuleInput; + } + } + } + + grouping NGRANECIMappingRuleSetGrp { + description "Represents the NGRANECIMappingRuleSet IOC."; + list dynamic5QIs { + description "This IOC represents a group of mapping rules."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses NGRANECIMappingRuleGrp; + } + } + } + + grouping NGRANECIMappingRuleSetSubtree { + description "Helps augmenting NGRANECIMappingRuleSet into multiple places."; + list NGRANECIMappingRuleSet { + description "Specifies the ECI mapping rules, see 3GPP TS 28.541."; + key "id"; + uses top3gpp:Top_Grp; + container attributes { + uses NGRANECIMappingRuleSetGrp; + } + uses NGRANECIMappingRuleGrp; + } + } + + augment "/subnet3gpp:SubNetwork" { + uses NGRANECIMappingRuleSetSubtree; + } + + augment "/me3gpp:ManagedElement" { + uses NGRANECIMappingRuleSetSubtree; + } + + augment "/me3gpp:ManagedElement" { + uses gnbcucp3gpp:NGRANECIMappingRuleSetSubtree; + } + +} -- GitLab From ab2c4cb44a8070d00e853cc81850ea97f4e5a1c9 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 14 Aug 2024 19:52:01 +0000 Subject: [PATCH 059/157] Update _3gpp-nr-nrm-externalgnbcuupfunction.yang --- yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang index 2445a1e99..b770fe84b 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang @@ -7,6 +7,7 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } + import _3gpp-5gc-nrm-ecimappingrule { prefix ecimapping3gpp; } organization "3GPP SA5"; description "Defines the YANG mapping of the ExternalGNBCUUPFunction @@ -16,6 +17,7 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-08-12 { reference CR-1336 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { @@ -41,6 +43,12 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { mandatory true; type int32 { range "22..32"; } } + + leaf nGRANECIMappingRuleRef { + description "DN of ECIMappingRuleSet."; + type types3gpp:DistinguishedName; + } + } grouping ExternalGNBCUUPFunctionWrapper { @@ -66,4 +74,4 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { if-feature nrnet3gpp:ExternalsUnderNRNetwork; uses ExternalGNBCUUPFunctionWrapper; } -} \ No newline at end of file +} -- GitLab From f6fef8110f4abe0c5f5d3a16bf9ba0734ee4555e Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 14 Aug 2024 19:54:17 +0000 Subject: [PATCH 060/157] Update _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 7d8eabeec..a8213313a 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,11 @@ module _3gpp-nr-nrm-gnbcucpfunction { type types3gpp:DistinguishedName; description "This is the DN of EphemerisInfoSet."; } + + leaf nGRANECIMappingRuleRef { + type types3gpp:DistinguishedName; + description "This is the DN of ECIMappingRuleSet."; + } } grouping QceIdMappingInfoGrp { @@ -223,4 +229,4 @@ module _3gpp-nr-nrm-gnbcucpfunction { } } } -} \ No newline at end of file +} -- GitLab From 6f49b9673fa27504054e11f018e113c380179057 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 14 Aug 2024 19:56:38 +0000 Subject: [PATCH 061/157] Update _3gpp-nr-nrm-ecimappingrule.yang --- yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang index cd7c67765..c78b0e45d 100644 --- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang @@ -1,4 +1,4 @@ -module _3gpp-5gc-nrm-ecimappingrule { +module _3gpp-nr-nrm-ecimappingrule { yang-version 1.1; namespace urn:3gpp:sa5:_3gpp-5gc-nrm-ecimappingrule; prefix ecimapping3gpp; @@ -89,7 +89,7 @@ module _3gpp-5gc-nrm-ecimappingrule { } augment "/me3gpp:ManagedElement" { - uses gnbcucp3gpp:NGRANECIMappingRuleSetSubtree; + uses NGRANECIMappingRuleSetSubtree; } } -- GitLab From 1cb8c3a2322523946a92df1fffbb6612fdea92d9 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 14 Aug 2024 19:59:35 +0000 Subject: [PATCH 062/157] Update _3gpp-nr-nrm-externalgnbcuupfunction.yang --- yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang | 8 -------- 1 file changed, 8 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang index b770fe84b..56a5fbe8b 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang @@ -7,7 +7,6 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } - import _3gpp-5gc-nrm-ecimappingrule { prefix ecimapping3gpp; } organization "3GPP SA5"; description "Defines the YANG mapping of the ExternalGNBCUUPFunction @@ -17,7 +16,6 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2024-08-12 { reference CR-1336 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { @@ -43,12 +41,6 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { mandatory true; type int32 { range "22..32"; } } - - leaf nGRANECIMappingRuleRef { - description "DN of ECIMappingRuleSet."; - type types3gpp:DistinguishedName; - } - } grouping ExternalGNBCUUPFunctionWrapper { -- GitLab From 1ad3cd6eaf4fd6f7a2905afa59a8a9cdc3b8f803 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 14 Aug 2024 20:00:29 +0000 Subject: [PATCH 063/157] Update _3gpp-nr-nrm-externalgnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang index cbe2baff3..f1b1e9ad3 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang @@ -17,6 +17,7 @@ module _3gpp-nr-nrm-externalgnbcucpfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-08-12 { reference CR-1336; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { @@ -51,6 +52,11 @@ module _3gpp-nr-nrm-externalgnbcucpfunction { max-elements 1; uses types3gpp:PLMNId; } + + leaf nGRANECIMappingRuleRef { + description "DN of ECIMappingRuleSet."; + type types3gpp:DistinguishedName; + } } grouping ExternalGNBCUCPFunctionWrapper { @@ -76,4 +82,4 @@ module _3gpp-nr-nrm-externalgnbcucpfunction { if-feature nrnet3gpp:ExternalsUnderNRNetwork; uses ExternalGNBCUCPFunctionWrapper; } -} \ No newline at end of file +} -- GitLab From 67f99d0daeb67a5c33872e9d78a58ff393fddb92 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 14 Aug 2024 20:04:08 +0000 Subject: [PATCH 064/157] Update _3gpp-nr-nrm-ecimappingrule.yang --- yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang index c78b0e45d..e4c599de5 100644 --- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang @@ -1,6 +1,6 @@ module _3gpp-nr-nrm-ecimappingrule { yang-version 1.1; - namespace urn:3gpp:sa5:_3gpp-5gc-nrm-ecimappingrule; + namespace urn:3gpp:sa5:_3gpp-nr-nrm-ecimappingrule; prefix ecimapping3gpp; import _3gpp-common-top { prefix top3gpp; } @@ -89,7 +89,7 @@ module _3gpp-nr-nrm-ecimappingrule { } augment "/me3gpp:ManagedElement" { - uses NGRANECIMappingRuleSetSubtree; + uses gnbcucp3gpp:ExternalGNBCUCPFunctionGrp; } } -- GitLab From a9ceba647e2aaa7985adf934a2a638237f00bbc8 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 14 Aug 2024 20:09:32 +0000 Subject: [PATCH 065/157] Update _3gpp-nr-nrm-ecimappingrule.yang --- yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang index e4c599de5..bc1df61c1 100644 --- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang @@ -1,6 +1,6 @@ module _3gpp-nr-nrm-ecimappingrule { yang-version 1.1; - namespace urn:3gpp:sa5:_3gpp-nr-nrm-ecimappingrule; + namespace urn:3gpp:sa5:_3gpp-nr-nrm-ecimaprule; prefix ecimapping3gpp; import _3gpp-common-top { prefix top3gpp; } -- GitLab From dda521b3e518616c7cfed05be7fec67e92176479 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 14 Aug 2024 20:15:13 +0000 Subject: [PATCH 066/157] Update _3gpp-nr-nrm-ecimappingrule.yang --- yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang index bc1df61c1..08861e60b 100644 --- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang @@ -1,7 +1,7 @@ module _3gpp-nr-nrm-ecimappingrule { yang-version 1.1; - namespace urn:3gpp:sa5:_3gpp-nr-nrm-ecimaprule; - prefix ecimapping3gpp; + namespace urn:3gpp:sa5:_3gpp-nr-nrm-ecimappingrule; + prefix ecimap3gpp; import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } -- GitLab From ca48d746b0b57797861f342d14ce33dc6c32a5ff Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 14 Aug 2024 20:19:51 +0000 Subject: [PATCH 067/157] Update _3gpp-nr-nrm-ecimappingrule.yang --- yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 4 ---- 1 file changed, 4 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang index 08861e60b..9648185a1 100644 --- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang @@ -88,8 +88,4 @@ module _3gpp-nr-nrm-ecimappingrule { uses NGRANECIMappingRuleSetSubtree; } - augment "/me3gpp:ManagedElement" { - uses gnbcucp3gpp:ExternalGNBCUCPFunctionGrp; - } - } -- GitLab From 3f29eba1ae0572864543d332e27ee06e568cfd77 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 14 Aug 2024 20:38:13 +0000 Subject: [PATCH 068/157] Update _3gpp-common-managed-element.yang --- yang-models/_3gpp-common-managed-element.yang | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index 233aa6f4a..ab421ebe0 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -33,6 +33,7 @@ module _3gpp-common-managed-element { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2024-08-12 { reference CR-1336 ; } revision 2024-01-30 { reference CR-0328 ; } revision 2023-11-14 { reference CR-0305 ; } revision 2023-09-18 { reference CR-0271 ; } @@ -182,6 +183,10 @@ module _3gpp-common-managed-element { min-elements 1; type string; } + leaf nGRANECIMappingRuleRef { + description "DN of ECIMappingRuleSet."; + type types3gpp:DistinguishedName; + } } grouping ManagedElementGrp { -- GitLab From c2e5f83e057baebfc5ad779bf1773da48e07d2aa Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 14 Aug 2024 20:46:58 +0000 Subject: [PATCH 069/157] Update _3gpp-nr-nrm-ecimappingrule.yang --- yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang index 9648185a1..b939ab27d 100644 --- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang @@ -6,7 +6,7 @@ module _3gpp-nr-nrm-ecimappingrule { import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } - import _3gpp-nr-nrm-externalgnbcucpfunction {prefix gnbcucp3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction {prefix gnbcucp3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -88,4 +88,8 @@ module _3gpp-nr-nrm-ecimappingrule { uses NGRANECIMappingRuleSetSubtree; } + augment "/me3gpp:GNBCUCPFunction" { + uses gnbcucp3gpp:; + } + } -- GitLab From 7da9129908f66b16a6d701712dcdc7bd11c46101 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 14 Aug 2024 20:51:09 +0000 Subject: [PATCH 070/157] Update _3gpp-nr-nrm-ecimappingrule.yang --- yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang index b939ab27d..99338e187 100644 --- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang @@ -88,8 +88,8 @@ module _3gpp-nr-nrm-ecimappingrule { uses NGRANECIMappingRuleSetSubtree; } - augment "/me3gpp:GNBCUCPFunction" { - uses gnbcucp3gpp:; + augment "/gnbcucp3gpp:GNBCUCPFunction" { + uses NGRANECIMappingRuleSetSubtree:; } } -- GitLab From 8f4b4f986760b357c18ba16b4438052bf5102a77 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 14 Aug 2024 20:55:27 +0000 Subject: [PATCH 071/157] Update _3gpp-nr-nrm-ecimappingrule.yang --- yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang index 99338e187..e0e948ee0 100644 --- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang @@ -88,7 +88,7 @@ module _3gpp-nr-nrm-ecimappingrule { uses NGRANECIMappingRuleSetSubtree; } - augment "/gnbcucp3gpp:GNBCUCPFunction" { + augment "/gnbcucp3gpp:GNBCUCPFunctionGrp" { uses NGRANECIMappingRuleSetSubtree:; } -- GitLab From 979fbd2b0fc674a12659a3ecabb39323e27ac544 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 14 Aug 2024 21:00:23 +0000 Subject: [PATCH 072/157] Update _3gpp-nr-nrm-ecimappingrule.yang --- yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang index e0e948ee0..99338e187 100644 --- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang @@ -88,7 +88,7 @@ module _3gpp-nr-nrm-ecimappingrule { uses NGRANECIMappingRuleSetSubtree; } - augment "/gnbcucp3gpp:GNBCUCPFunctionGrp" { + augment "/gnbcucp3gpp:GNBCUCPFunction" { uses NGRANECIMappingRuleSetSubtree:; } -- GitLab From a3f790c565e02b73eec1d919f5e00321f6ad756f Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 14 Aug 2024 21:03:25 +0000 Subject: [PATCH 073/157] Update _3gpp-nr-nrm-ecimappingrule.yang --- yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 4 ---- 1 file changed, 4 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang index 99338e187..2b18ecc51 100644 --- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang @@ -88,8 +88,4 @@ module _3gpp-nr-nrm-ecimappingrule { uses NGRANECIMappingRuleSetSubtree; } - augment "/gnbcucp3gpp:GNBCUCPFunction" { - uses NGRANECIMappingRuleSetSubtree:; - } - } -- GitLab From 72f9fd025c1edca70b26bb36e7e5338a55873651 Mon Sep 17 00:00:00 2001 From: scottma Date: Tue, 20 Aug 2024 15:32:32 +0000 Subject: [PATCH 074/157] Update _3gpp-nr-nrm-ecimappingrule.yang --- yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 52 ++++++++------------ 1 file changed, 20 insertions(+), 32 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang index 2b18ecc51..2c9e67c3b 100644 --- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang @@ -1,7 +1,7 @@ -module _3gpp-nr-nrm-ecimappingrule { +module _3gpp-nr-nrm-ecmappingrule { yang-version 1.1; - namespace urn:3gpp:sa5:_3gpp-nr-nrm-ecimappingrule; - prefix ecimap3gpp; + namespace urn:3gpp:sa5:_3gpp-nr-nrm-ecmappingrule; + prefix ecmap3gpp; import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } @@ -18,24 +18,23 @@ module _3gpp-nr-nrm-ecimappingrule { revision 2024-08-12 { reference CR-1336 ; } - grouping ECIMappingRuleInput { + grouping ecMappingRuleInput { description - "Input to the unified mapping rule to support ECI."; - reference "3GPP TS 28.541"; + "Input to the unified mapping rule to support energy cost reporting."; - leaf eciMRInputMinimumValue { + leaf ecMRInputMinimumValue { type uint8; description "The minimum value of to be applied for mapping from this attribute to the energy cost."; } - leaf eciMRInputMaximumValue { + leaf ecMRInputMaximumValue { type uint8; description "The maximum value of to be applied for mapping from this attribute to the energy cost."; } - leaf eciTimeInterval { + leaf ecTimeInterval { type uint8; description "Time interval (in seconds) that should be applied for collecting values of mapping @@ -43,49 +42,38 @@ module _3gpp-nr-nrm-ecimappingrule { } } - grouping NGRANECIMappingRuleGrp { - description "Represents the NGRANECIMappingRule IOC."; - list dynamic5QIs { + grouping NGRANECMappingRuleGrp { + description "Represents the NGRANECMappingRule IOC."; + list rules { description "This IOC represents a unified mapping rule."; key id; uses top3gpp:Top_Grp; container attributes { - uses ECIMappingRuleInput; + uses ECMappingRuleInput; } } } - - grouping NGRANECIMappingRuleSetGrp { - description "Represents the NGRANECIMappingRuleSet IOC."; - list dynamic5QIs { - description "This IOC represents a group of mapping rules."; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses NGRANECIMappingRuleGrp; - } - } } - grouping NGRANECIMappingRuleSetSubtree { - description "Helps augmenting NGRANECIMappingRuleSet into multiple places."; - list NGRANECIMappingRuleSet { - description "Specifies the ECI mapping rules, see 3GPP TS 28.541."; + grouping NGRANECMappingRuleSubtree { + description "Helps augmenting NGRANECMappingRule into multiple places."; + list NGRANECMappingRule { + description "Specifies the energy cost mapping rules."; key "id"; uses top3gpp:Top_Grp; container attributes { - uses NGRANECIMappingRuleSetGrp; + uses NGRANECMappingRuleGrp; } - uses NGRANECIMappingRuleGrp; + uses NGRANECMappingRuleGrp; } } augment "/subnet3gpp:SubNetwork" { - uses NGRANECIMappingRuleSetSubtree; + uses NGRANECMappingRuleSubtree; } augment "/me3gpp:ManagedElement" { - uses NGRANECIMappingRuleSetSubtree; + uses NGRANECMappingRuleSubtree; } } -- GitLab From 03bee1eb40f8f046e6874415e202904a23f4f819 Mon Sep 17 00:00:00 2001 From: scottma Date: Tue, 20 Aug 2024 15:38:01 +0000 Subject: [PATCH 075/157] Update _3gpp-nr-nrm-ecimappingrule.yang --- yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang index 2c9e67c3b..62394428f 100644 --- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang @@ -18,23 +18,23 @@ module _3gpp-nr-nrm-ecmappingrule { revision 2024-08-12 { reference CR-1336 ; } - grouping ecMappingRuleInput { + grouping ECMappingRuleInput { description "Input to the unified mapping rule to support energy cost reporting."; - leaf ecMRInputMinimumValue { + leaf eCMRInputMinValue { type uint8; description "The minimum value of to be applied for mapping from this attribute to the energy cost."; } - leaf ecMRInputMaximumValue { + leaf eCMRInputMaxValue { type uint8; description "The maximum value of to be applied for mapping from this attribute to the energy cost."; } - leaf ecTimeInterval { + leaf eCTimeInterval { type uint8; description "Time interval (in seconds) that should be applied for collecting values of mapping -- GitLab From 3b4bb3c79d6ddc7e17d8577dc6bfde516520afaf Mon Sep 17 00:00:00 2001 From: scottma Date: Tue, 20 Aug 2024 15:38:49 +0000 Subject: [PATCH 076/157] Update _3gpp-nr-nrm-externalgnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang | 6 ------ 1 file changed, 6 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang index f1b1e9ad3..6c295a404 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang @@ -17,7 +17,6 @@ module _3gpp-nr-nrm-externalgnbcucpfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2024-08-12 { reference CR-1336; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { @@ -52,11 +51,6 @@ module _3gpp-nr-nrm-externalgnbcucpfunction { max-elements 1; uses types3gpp:PLMNId; } - - leaf nGRANECIMappingRuleRef { - description "DN of ECIMappingRuleSet."; - type types3gpp:DistinguishedName; - } } grouping ExternalGNBCUCPFunctionWrapper { -- GitLab From 8ea0c9923ecf24a4819d1face16003ec993caed5 Mon Sep 17 00:00:00 2001 From: scottma Date: Tue, 20 Aug 2024 15:52:38 +0000 Subject: [PATCH 077/157] Update _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index a8213313a..7b168c437 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -182,9 +182,9 @@ module _3gpp-nr-nrm-gnbcucpfunction { description "This is the DN of EphemerisInfoSet."; } - leaf nGRANECIMappingRuleRef { + leaf nRECMappingRuleRef { type types3gpp:DistinguishedName; - description "This is the DN of ECIMappingRuleSet."; + description "DN of a NRECMappingRule."; } } -- GitLab From f9f1c59b9384677307455c0699e04c26d6278ca8 Mon Sep 17 00:00:00 2001 From: scottma Date: Tue, 20 Aug 2024 15:57:40 +0000 Subject: [PATCH 078/157] Update _3gpp-common-managed-element.yang --- yang-models/_3gpp-common-managed-element.yang | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index ab421ebe0..570791a14 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -143,6 +143,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 @@ -183,10 +184,12 @@ module _3gpp-common-managed-element { min-elements 1; type string; } - leaf nGRANECIMappingRuleRef { - description "DN of ECIMappingRuleSet."; + + leaf nRECMappingRuleRef { type types3gpp:DistinguishedName; + description "DN of a NRECMappingRule."; } + } grouping ManagedElementGrp { -- GitLab From cbc54b1aa55681104be4b9b9f0798003afb48702 Mon Sep 17 00:00:00 2001 From: scottma Date: Tue, 20 Aug 2024 16:02:17 +0000 Subject: [PATCH 079/157] Update _3gpp-nr-nrm-ecimappingrule.yang --- yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang index 62394428f..fea406f9a 100644 --- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang @@ -52,8 +52,7 @@ module _3gpp-nr-nrm-ecmappingrule { uses ECMappingRuleInput; } } - } - } + } grouping NGRANECMappingRuleSubtree { description "Helps augmenting NGRANECMappingRule into multiple places."; -- GitLab From 12199001d311bd3cad96a356b64bfb6a5abae38c Mon Sep 17 00:00:00 2001 From: scottma Date: Tue, 20 Aug 2024 16:07:31 +0000 Subject: [PATCH 080/157] Add new file --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 1 + 1 file changed, 1 insertion(+) create mode 100644 yang-models/_3gpp-nr-nrm-ecmappingrule.yang diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -0,0 +1 @@ + -- GitLab From 11a62a59b69e080730c81f29799f89714c0d1ee2 Mon Sep 17 00:00:00 2001 From: scottma Date: Tue, 20 Aug 2024 16:08:33 +0000 Subject: [PATCH 081/157] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 77 +++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index 8b1378917..fea406f9a 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -1 +1,78 @@ +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; } + import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction {prefix gnbcucp3gpp; } + 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 2023, 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 ECMappingRuleInput { + description + "Input to the unified mapping rule to support energy cost reporting."; + + 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."; + } + } + + grouping NGRANECMappingRuleGrp { + description "Represents the NGRANECMappingRule IOC."; + list rules { + description "This IOC represents a unified mapping rule."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses ECMappingRuleInput; + } + } + } + + grouping NGRANECMappingRuleSubtree { + description "Helps augmenting NGRANECMappingRule into multiple places."; + list NGRANECMappingRule { + description "Specifies the energy cost mapping rules."; + key "id"; + uses top3gpp:Top_Grp; + container attributes { + uses NGRANECMappingRuleGrp; + } + uses NGRANECMappingRuleGrp; + } + } + + augment "/subnet3gpp:SubNetwork" { + uses NGRANECMappingRuleSubtree; + } + + augment "/me3gpp:ManagedElement" { + uses NGRANECMappingRuleSubtree; + } + +} -- GitLab From 764a8c66d720690e6a27483ec8e594d59a1ff1d5 Mon Sep 17 00:00:00 2001 From: scottma Date: Tue, 20 Aug 2024 16:08:51 +0000 Subject: [PATCH 082/157] Delete _3gpp-nr-nrm-ecimappingrule.yang --- yang-models/_3gpp-nr-nrm-ecimappingrule.yang | 78 -------------------- 1 file changed, 78 deletions(-) delete mode 100644 yang-models/_3gpp-nr-nrm-ecimappingrule.yang diff --git a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang b/yang-models/_3gpp-nr-nrm-ecimappingrule.yang deleted file mode 100644 index fea406f9a..000000000 --- a/yang-models/_3gpp-nr-nrm-ecimappingrule.yang +++ /dev/null @@ -1,78 +0,0 @@ -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; } - import _3gpp-common-subnetwork { prefix subnet3gpp; } - import _3gpp-common-managed-element { prefix me3gpp; } - import _3gpp-nr-nrm-gnbcucpfunction {prefix gnbcucp3gpp; } - - 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 2023, 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 ECMappingRuleInput { - description - "Input to the unified mapping rule to support energy cost reporting."; - - 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."; - } - } - - grouping NGRANECMappingRuleGrp { - description "Represents the NGRANECMappingRule IOC."; - list rules { - description "This IOC represents a unified mapping rule."; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses ECMappingRuleInput; - } - } - } - - grouping NGRANECMappingRuleSubtree { - description "Helps augmenting NGRANECMappingRule into multiple places."; - list NGRANECMappingRule { - description "Specifies the energy cost mapping rules."; - key "id"; - uses top3gpp:Top_Grp; - container attributes { - uses NGRANECMappingRuleGrp; - } - uses NGRANECMappingRuleGrp; - } - } - - augment "/subnet3gpp:SubNetwork" { - uses NGRANECMappingRuleSubtree; - } - - augment "/me3gpp:ManagedElement" { - uses NGRANECMappingRuleSubtree; - } - -} -- GitLab From 19561e3a232eaf2a53eee01addaa2e56591bf99e Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 09:23:57 +0000 Subject: [PATCH 083/157] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index fea406f9a..07d10a213 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -12,7 +12,7 @@ module _3gpp-nr-nrm-ecmappingrule { 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 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"; -- GitLab From 0d2c18f1078298bdc5a681a7ead1f00d93dd5737 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 14:22:16 +0000 Subject: [PATCH 084/157] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index 07d10a213..dbce8e314 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -18,6 +18,11 @@ module _3gpp-nr-nrm-ecmappingrule { revision 2024-08-12 { reference CR-1336 ; } + feature EnergyCostMappingRule { + description "Indicates whether alarm acknowledgement by the consumer is + supported."; + } + grouping ECMappingRuleInput { description "Input to the unified mapping rule to support energy cost reporting."; @@ -37,8 +42,9 @@ module _3gpp-nr-nrm-ecmappingrule { 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."; + should be applied for collecting values of mapping + rule attribute to be used for computing the energy cost."; + units seconds; } } @@ -63,16 +69,16 @@ module _3gpp-nr-nrm-ecmappingrule { container attributes { uses NGRANECMappingRuleGrp; } - uses NGRANECMappingRuleGrp; } } augment "/subnet3gpp:SubNetwork" { + if-feature EnergyCostMappingRule; uses NGRANECMappingRuleSubtree; } augment "/me3gpp:ManagedElement" { + if-feature EnergyCostMappingRule; uses NGRANECMappingRuleSubtree; } - } -- GitLab From 510235d9e89463f53585cac09adad6057d667204 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 14:24:46 +0000 Subject: [PATCH 085/157] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 25 ++++++++------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index dbce8e314..5295e7d2f 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -22,12 +22,15 @@ module _3gpp-nr-nrm-ecmappingrule { description "Indicates whether alarm acknowledgement by the consumer is supported."; } - - grouping ECMappingRuleInput { - description - "Input to the unified mapping rule to support energy cost reporting."; - leaf eCMRInputMinValue { + grouping NGRANECMappingRuleGrp { + description "Represents the NGRANECMappingRule IOC."; + list rules { + description "This IOC represents a unified mapping rule."; + key id; + uses top3gpp:Top_Grp; + container attributes { + leaf eCMRInputMinValue { type uint8; description "The minimum value of to be applied for mapping from this attribute to the energy cost."; @@ -46,19 +49,9 @@ module _3gpp-nr-nrm-ecmappingrule { rule attribute to be used for computing the energy cost."; units seconds; } - } - - grouping NGRANECMappingRuleGrp { - description "Represents the NGRANECMappingRule IOC."; - list rules { - description "This IOC represents a unified mapping rule."; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses ECMappingRuleInput; - } } } + } grouping NGRANECMappingRuleSubtree { description "Helps augmenting NGRANECMappingRule into multiple places."; -- GitLab From 81a30050f186bf3f63467d7b4428397df57b6721 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 15:05:31 +0000 Subject: [PATCH 086/157] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 39 +++++++++++++-------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index 5295e7d2f..7a18db3db 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -18,19 +18,16 @@ module _3gpp-nr-nrm-ecmappingrule { revision 2024-08-12 { reference CR-1336 ; } - feature EnergyCostMappingRule { - description "Indicates whether alarm acknowledgement by the consumer is - supported."; + feature ECMappingRuleUnderSubNetwork { + description "ECMappingRule shall be contained under SubNetwork."; + } + + feature ECMappingRuleUnderManagedElement { + description "ECMappingRule shall be contained under ManagedElement."; } - grouping NGRANECMappingRuleGrp { - description "Represents the NGRANECMappingRule IOC."; - list rules { - description "This IOC represents a unified mapping rule."; - key id; - uses top3gpp:Top_Grp; - container attributes { - leaf eCMRInputMinValue { + grouping ECMappingRuleInputGrp { + leaf eCMRInputMinValue { type uint8; description "The minimum value of to be applied for mapping from this attribute to the energy cost."; @@ -49,15 +46,27 @@ module _3gpp-nr-nrm-ecmappingrule { rule attribute to be used for computing the energy cost."; units seconds; } + } + + grouping NGRANECMappingRuleGrp { + description "Represents the NGRANECMappingRule IOC."; + list rules { + description "This IOC represents a unified mapping rule."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses ECMappingRuleInputGrp; } } } grouping NGRANECMappingRuleSubtree { + key "idx"; + min-elements 1; + max-elements 1; description "Helps augmenting NGRANECMappingRule into multiple places."; - list NGRANECMappingRule { + list idx { description "Specifies the energy cost mapping rules."; - key "id"; uses top3gpp:Top_Grp; container attributes { uses NGRANECMappingRuleGrp; @@ -66,12 +75,12 @@ module _3gpp-nr-nrm-ecmappingrule { } augment "/subnet3gpp:SubNetwork" { - if-feature EnergyCostMappingRule; + if-feature EnergyCostMapECMappingRuleUnderSubNetwork; uses NGRANECMappingRuleSubtree; } augment "/me3gpp:ManagedElement" { - if-feature EnergyCostMappingRule; + if-feature ECMappingRuleUnderManagedElement; uses NGRANECMappingRuleSubtree; } } -- GitLab From 58dae69ddcd302f0f07faa91eec63346feca0d07 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 15:15:10 +0000 Subject: [PATCH 087/157] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index 7a18db3db..ef094c5e7 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -6,8 +6,7 @@ module _3gpp-nr-nrm-ecmappingrule { import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } - import _3gpp-nr-nrm-gnbcucpfunction {prefix gnbcucp3gpp; } - + 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 @@ -75,7 +74,7 @@ module _3gpp-nr-nrm-ecmappingrule { } augment "/subnet3gpp:SubNetwork" { - if-feature EnergyCostMapECMappingRuleUnderSubNetwork; + if-feature ECMappingRuleUnderSubNetwork; uses NGRANECMappingRuleSubtree; } -- GitLab From d0d948eec68e68b780f11abc6d56481660382616 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 15:17:22 +0000 Subject: [PATCH 088/157] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 1 - 1 file changed, 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index ef094c5e7..2afbb8421 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -57,7 +57,6 @@ module _3gpp-nr-nrm-ecmappingrule { uses ECMappingRuleInputGrp; } } - } grouping NGRANECMappingRuleSubtree { key "idx"; -- GitLab From 2cd03bdcd16726bda0ad8dfaa467a6f97a87b2b1 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 15:24:11 +0000 Subject: [PATCH 089/157] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index 2afbb8421..ef094c5e7 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -57,6 +57,7 @@ module _3gpp-nr-nrm-ecmappingrule { uses ECMappingRuleInputGrp; } } + } grouping NGRANECMappingRuleSubtree { key "idx"; -- GitLab From 1b5040458b3419dcdcb1d0d74a3d63017f01376e Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 15:57:08 +0000 Subject: [PATCH 090/157] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index ef094c5e7..ad125aac2 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -60,7 +60,7 @@ module _3gpp-nr-nrm-ecmappingrule { } grouping NGRANECMappingRuleSubtree { - key "idx"; + key idx; min-elements 1; max-elements 1; description "Helps augmenting NGRANECMappingRule into multiple places."; -- GitLab From 75e4a046cfc6d27375b34e0f63cfb101f1de1de4 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 16:17:08 +0000 Subject: [PATCH 091/157] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index ad125aac2..24397bd00 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -60,19 +60,19 @@ module _3gpp-nr-nrm-ecmappingrule { } grouping NGRANECMappingRuleSubtree { - key idx; + description "Helps augmenting NGRANECMappingRule into multiple places."; + key "idx"; min-elements 1; max-elements 1; - description "Helps augmenting NGRANECMappingRule into multiple places."; - list idx { - description "Specifies the energy cost mapping rules."; + list rules { + key "idx"; uses top3gpp:Top_Grp; - container attributes { + container idx { uses NGRANECMappingRuleGrp; } } } - + augment "/subnet3gpp:SubNetwork" { if-feature ECMappingRuleUnderSubNetwork; uses NGRANECMappingRuleSubtree; -- GitLab From 48f5e37503a19fe24b48a7b62a8a4002b2ec38de Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 16:36:49 +0000 Subject: [PATCH 092/157] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index 24397bd00..cb12d1894 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -61,12 +61,10 @@ module _3gpp-nr-nrm-ecmappingrule { grouping NGRANECMappingRuleSubtree { description "Helps augmenting NGRANECMappingRule into multiple places."; - key "idx"; - min-elements 1; - max-elements 1; list rules { key "idx"; - uses top3gpp:Top_Grp; + min-elements 1; + max-elements 1; container idx { uses NGRANECMappingRuleGrp; } -- GitLab From 2360a3a6eee0d289e497c172f3bfcd798f6e14d3 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 16:42:43 +0000 Subject: [PATCH 093/157] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index cb12d1894..640046d81 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -50,7 +50,6 @@ module _3gpp-nr-nrm-ecmappingrule { grouping NGRANECMappingRuleGrp { description "Represents the NGRANECMappingRule IOC."; list rules { - description "This IOC represents a unified mapping rule."; key id; uses top3gpp:Top_Grp; container attributes { @@ -61,13 +60,11 @@ module _3gpp-nr-nrm-ecmappingrule { grouping NGRANECMappingRuleSubtree { description "Helps augmenting NGRANECMappingRule into multiple places."; - list rules { - key "idx"; - min-elements 1; - max-elements 1; - container idx { + key "idx"; + min-elements 1; + max-elements 1; + list idx { uses NGRANECMappingRuleGrp; - } } } -- GitLab From 24570eb10c17f85d50198f722bfb05019cf6e59b Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 16:55:29 +0000 Subject: [PATCH 094/157] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index 640046d81..c0ffec40b 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -60,13 +60,15 @@ module _3gpp-nr-nrm-ecmappingrule { grouping NGRANECMappingRuleSubtree { description "Helps augmenting NGRANECMappingRule into multiple places."; + list mappingrule { key "idx"; min-elements 1; max-elements 1; - list idx { + container idx { uses NGRANECMappingRuleGrp; } } + } augment "/subnet3gpp:SubNetwork" { if-feature ECMappingRuleUnderSubNetwork; -- GitLab From ca7fe0b47d9617a1e59db0c7b91b753ca552ab90 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 17:00:38 +0000 Subject: [PATCH 095/157] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index c0ffec40b..1e5de11a7 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -64,9 +64,7 @@ module _3gpp-nr-nrm-ecmappingrule { key "idx"; min-elements 1; max-elements 1; - container idx { - uses NGRANECMappingRuleGrp; - } + uses NGRANECMappingRuleGrp; } } -- GitLab From fbe9ceb9cd30beb0710ed360fe7b811828da5335 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 17:06:11 +0000 Subject: [PATCH 096/157] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index 1e5de11a7..b29038034 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -61,11 +61,11 @@ module _3gpp-nr-nrm-ecmappingrule { grouping NGRANECMappingRuleSubtree { description "Helps augmenting NGRANECMappingRule into multiple places."; list mappingrule { - key "idx"; - min-elements 1; - max-elements 1; - uses NGRANECMappingRuleGrp; - } + key idx; + min-elements 1; + max-elements 1; + uses NGRANECMappingRuleGrp; + } } augment "/subnet3gpp:SubNetwork" { -- GitLab From 352dfaf4453acfc3cae959766295b8de347552e8 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 20:42:49 +0000 Subject: [PATCH 097/157] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 31 +++++++++------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index b29038034..5a0c3854f 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -25,17 +25,18 @@ module _3gpp-nr-nrm-ecmappingrule { description "ECMappingRule shall be contained under ManagedElement."; } - grouping ECMappingRuleInputGrp { + grouping NGRANECMappingRuleGrp { + description "Represents the NGRANECMappingRule IOC."; leaf eCMRInputMinValue { type uint8; description "The minimum value of to be applied - for mapping from this attribute to the energy cost."; + 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."; + for mapping from this attribute to the energy cost."; } leaf eCTimeInterval { @@ -44,27 +45,21 @@ module _3gpp-nr-nrm-ecmappingrule { should be applied for collecting values of mapping rule attribute to be used for computing the energy cost."; units seconds; - } - } - - grouping NGRANECMappingRuleGrp { - description "Represents the NGRANECMappingRule IOC."; - list rules { - key id; - uses top3gpp:Top_Grp; - container attributes { - uses ECMappingRuleInputGrp; - } - } + }; } grouping NGRANECMappingRuleSubtree { description "Helps augmenting NGRANECMappingRule into multiple places."; - list mappingrule { - key idx; + list NGRANECMappingRule { + key id; + use top3gpp:Top_Grp; min-elements 1; max-elements 1; - uses NGRANECMappingRuleGrp; + leaf idx { type unit32; } + container attributes { + uses NGRANECMappingRuleGrp; + } + } } } -- GitLab From 54ba360c500b7f67993c729505d9492a354d14b3 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 20:47:21 +0000 Subject: [PATCH 098/157] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index 5a0c3854f..f9ae083f4 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -45,7 +45,7 @@ module _3gpp-nr-nrm-ecmappingrule { should be applied for collecting values of mapping rule attribute to be used for computing the energy cost."; units seconds; - }; + } } grouping NGRANECMappingRuleSubtree { @@ -60,7 +60,6 @@ module _3gpp-nr-nrm-ecmappingrule { uses NGRANECMappingRuleGrp; } } - } } augment "/subnet3gpp:SubNetwork" { -- GitLab From 888b1afe174276518c53b46e17753756bc7aa3f8 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 20:55:09 +0000 Subject: [PATCH 099/157] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index f9ae083f4..ed7db374a 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -52,10 +52,10 @@ module _3gpp-nr-nrm-ecmappingrule { description "Helps augmenting NGRANECMappingRule into multiple places."; list NGRANECMappingRule { key id; - use top3gpp:Top_Grp; + uses top3gpp:Top_Grp; min-elements 1; max-elements 1; - leaf idx { type unit32; } + leaf idx { type uit32; } container attributes { uses NGRANECMappingRuleGrp; } @@ -64,11 +64,11 @@ module _3gpp-nr-nrm-ecmappingrule { augment "/subnet3gpp:SubNetwork" { if-feature ECMappingRuleUnderSubNetwork; - uses NGRANECMappingRuleSubtree; + uses NGRANECMappingRuleSubtree; } augment "/me3gpp:ManagedElement" { if-feature ECMappingRuleUnderManagedElement; - uses NGRANECMappingRuleSubtree; + uses NGRANECMappingRuleSubtree; } } -- GitLab From 98998adadf50457ba7b07795f8e7cdb2ac0ec4e4 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 20:58:51 +0000 Subject: [PATCH 100/157] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index ed7db374a..c0331bc89 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -55,7 +55,7 @@ module _3gpp-nr-nrm-ecmappingrule { uses top3gpp:Top_Grp; min-elements 1; max-elements 1; - leaf idx { type uit32; } + leaf idx { type uint32; } container attributes { uses NGRANECMappingRuleGrp; } -- GitLab From 05e739681864a3d8f53a0cb76e085c39fd521978 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 21:03:10 +0000 Subject: [PATCH 101/157] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index c0331bc89..0e796831c 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -64,7 +64,10 @@ module _3gpp-nr-nrm-ecmappingrule { augment "/subnet3gpp:SubNetwork" { if-feature ECMappingRuleUnderSubNetwork; - uses NGRANECMappingRuleSubtree; + when '"1" = "1"'{ + uses NGRANECMappingRuleSubtree; + } + } } augment "/me3gpp:ManagedElement" { -- GitLab From cf9c92c6f6e54d46de8c293390e4c20b7473ca42 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 21:05:38 +0000 Subject: [PATCH 102/157] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index 0e796831c..6cbf8cbff 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -64,10 +64,9 @@ module _3gpp-nr-nrm-ecmappingrule { augment "/subnet3gpp:SubNetwork" { if-feature ECMappingRuleUnderSubNetwork; - when '"1" = "1"'{ + when '"1" = "1"'; uses NGRANECMappingRuleSubtree; } - } } augment "/me3gpp:ManagedElement" { -- GitLab From f4ff027d6ba6266eb05cd66720a87ceccfbaff5b Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 Aug 2024 21:12:39 +0000 Subject: [PATCH 103/157] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 1 - 1 file changed, 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index 6cbf8cbff..0d26806a5 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -66,7 +66,6 @@ module _3gpp-nr-nrm-ecmappingrule { if-feature ECMappingRuleUnderSubNetwork; when '"1" = "1"'; uses NGRANECMappingRuleSubtree; - } } augment "/me3gpp:ManagedElement" { -- GitLab From f4ae3bda1c3fccc333143587505cb65afe6bb165 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 21 Aug 2024 23:24:44 +0200 Subject: [PATCH 104/157] update x --- yang-models/_3gpp-common-managed-element.yang | 9 ++++++++ yang-models/_3gpp-common-subnetwork.yang | 10 +++++++++ yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 21 ------------------- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index 570791a14..c9645cec4 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"; @@ -50,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"; @@ -312,5 +317,9 @@ module _3gpp-common-managed-element { uses econn3gpp:EcmConnectionInfoSubtree { if-feature EcmConnectionInfoUnderManagedElement; } + + uses ecmap3gpp:NGRANECMappingRuleSubtree { + if-feature EcmConnectionInfoUnderManagedElement; + } } } diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang index d6d5f7010..85676b8b8 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:NGRANECMappingRuleSubtree { + if-feature EcmConnectionInfoUnderSubNetwork; + } + // augment external parts here } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index 0d26806a5..fa1fa3a62 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -4,8 +4,6 @@ module _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp; import _3gpp-common-top { prefix top3gpp; } - import _3gpp-common-subnetwork { prefix subnet3gpp; } - import _3gpp-common-managed-element { prefix me3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -17,14 +15,6 @@ module _3gpp-nr-nrm-ecmappingrule { revision 2024-08-12 { reference CR-1336 ; } - feature ECMappingRuleUnderSubNetwork { - description "ECMappingRule shall be contained under SubNetwork."; - } - - feature ECMappingRuleUnderManagedElement { - description "ECMappingRule shall be contained under ManagedElement."; - } - grouping NGRANECMappingRuleGrp { description "Represents the NGRANECMappingRule IOC."; leaf eCMRInputMinValue { @@ -61,15 +51,4 @@ module _3gpp-nr-nrm-ecmappingrule { } } } - - augment "/subnet3gpp:SubNetwork" { - if-feature ECMappingRuleUnderSubNetwork; - when '"1" = "1"'; - uses NGRANECMappingRuleSubtree; - } - - augment "/me3gpp:ManagedElement" { - if-feature ECMappingRuleUnderManagedElement; - uses NGRANECMappingRuleSubtree; - } } -- GitLab From 2c90a46a3dd7c25a251393a93e1c3c4ea3ffc973 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 Aug 2024 07:40:46 +0000 Subject: [PATCH 105/157] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index fa1fa3a62..d35070c4d 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -41,6 +41,7 @@ module _3gpp-nr-nrm-ecmappingrule { grouping NGRANECMappingRuleSubtree { description "Helps augmenting NGRANECMappingRule into multiple places."; list NGRANECMappingRule { + description "The mapping rule."; key id; uses top3gpp:Top_Grp; min-elements 1; -- GitLab From e6d73d5f8a1aeaf011a0b48d80dc0563e0045f44 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 Aug 2024 10:22:12 +0000 Subject: [PATCH 106/157] Revert "Update _3gpp-nr-nrm-externalgnbcuupfunction.yang" This reverts commit a967c4640554698c7a3abdce07d3a5fd4d0edd0f --- yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang index 56a5fbe8b..b770fe84b 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang @@ -7,6 +7,7 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } + import _3gpp-5gc-nrm-ecimappingrule { prefix ecimapping3gpp; } organization "3GPP SA5"; description "Defines the YANG mapping of the ExternalGNBCUUPFunction @@ -16,6 +17,7 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-08-12 { reference CR-1336 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { @@ -41,6 +43,12 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { mandatory true; type int32 { range "22..32"; } } + + leaf nGRANECIMappingRuleRef { + description "DN of ECIMappingRuleSet."; + type types3gpp:DistinguishedName; + } + } grouping ExternalGNBCUUPFunctionWrapper { -- GitLab From b7657827f26bc088651404ddbcebcd0cc9960e9f Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 Aug 2024 11:07:12 +0000 Subject: [PATCH 107/157] Revert "Update _3gpp-nr-nrm-externalgnbcuupfunction.yang" This reverts commit cb70be13f8622db163aa403a6d968aa2279747a8 --- yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang index b770fe84b..2445a1e99 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang @@ -7,7 +7,6 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } - import _3gpp-5gc-nrm-ecimappingrule { prefix ecimapping3gpp; } organization "3GPP SA5"; description "Defines the YANG mapping of the ExternalGNBCUUPFunction @@ -17,7 +16,6 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2024-08-12 { reference CR-1336 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { @@ -43,12 +41,6 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { mandatory true; type int32 { range "22..32"; } } - - leaf nGRANECIMappingRuleRef { - description "DN of ECIMappingRuleSet."; - type types3gpp:DistinguishedName; - } - } grouping ExternalGNBCUUPFunctionWrapper { @@ -74,4 +66,4 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { if-feature nrnet3gpp:ExternalsUnderNRNetwork; uses ExternalGNBCUUPFunctionWrapper; } -} +} \ No newline at end of file -- GitLab From a3c72170e7440d98ded710ee62b8a2482bec1ef5 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 Aug 2024 14:28:28 +0000 Subject: [PATCH 108/157] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index d35070c4d..949f21289 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -15,8 +15,8 @@ module _3gpp-nr-nrm-ecmappingrule { revision 2024-08-12 { reference CR-1336 ; } - grouping NGRANECMappingRuleGrp { - description "Represents the NGRANECMappingRule IOC."; + grouping NRECMappingRuleGrp { + description "Represents the NRECMappingRule IOC."; leaf eCMRInputMinValue { type uint8; description "The minimum value of to be applied @@ -38,9 +38,9 @@ module _3gpp-nr-nrm-ecmappingrule { } } - grouping NGRANECMappingRuleSubtree { - description "Helps augmenting NGRANECMappingRule into multiple places."; - list NGRANECMappingRule { + grouping NRECMappingRuleSubtree { + description "Helps augmenting NRECMappingRule into multiple places."; + list NRECMappingRule { description "The mapping rule."; key id; uses top3gpp:Top_Grp; @@ -48,7 +48,7 @@ module _3gpp-nr-nrm-ecmappingrule { max-elements 1; leaf idx { type uint32; } container attributes { - uses NGRANECMappingRuleGrp; + uses NRECMappingRuleGrp; } } } -- GitLab From 9df9348222abc3ef484306e30469561963037b2f Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 Aug 2024 14:29:02 +0000 Subject: [PATCH 109/157] Update _3gpp-common-subnetwork.yang --- yang-models/_3gpp-common-subnetwork.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang index 85676b8b8..23362b81d 100755 --- a/yang-models/_3gpp-common-subnetwork.yang +++ b/yang-models/_3gpp-common-subnetwork.yang @@ -275,10 +275,10 @@ module _3gpp-common-subnetwork { reference "RFC8528 YANG Schema Mount"; } - uses ecmap3gpp:NGRANECMappingRuleSubtree { + uses ecmap3gpp:NRECMappingRuleSubtree { if-feature EcmConnectionInfoUnderSubNetwork; } // augment external parts here } -} \ No newline at end of file +} -- GitLab From b8a50ff1cf82edeee6fe0e52612ee5b001ee47eb Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 Aug 2024 14:39:59 +0000 Subject: [PATCH 110/157] Update _3gpp-common-managed-element.yang --- yang-models/_3gpp-common-managed-element.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index c9645cec4..bf3d07317 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -318,7 +318,7 @@ module _3gpp-common-managed-element { if-feature EcmConnectionInfoUnderManagedElement; } - uses ecmap3gpp:NGRANECMappingRuleSubtree { + uses ecmap3gpp:NRECMappingRuleSubtree { if-feature EcmConnectionInfoUnderManagedElement; } } -- GitLab From 5201b312b9b4d486d78edf15bbe1b58077bf999a Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 23 Aug 2024 06:09:05 +0000 Subject: [PATCH 111/157] Revert "Update _3gpp-common-managed-element.yang" This reverts commit 51cc70b82b520025091ec976401d5430ea0c8cb0 --- yang-models/_3gpp-common-managed-element.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index bf3d07317..c9645cec4 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -318,7 +318,7 @@ module _3gpp-common-managed-element { if-feature EcmConnectionInfoUnderManagedElement; } - uses ecmap3gpp:NRECMappingRuleSubtree { + uses ecmap3gpp:NGRANECMappingRuleSubtree { if-feature EcmConnectionInfoUnderManagedElement; } } -- GitLab From a96b700798fc909ee2fb4a54fb7647fa96618ed7 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 23 Aug 2024 06:14:06 +0000 Subject: [PATCH 112/157] Update _3gpp-common-managed-element.yang --- yang-models/_3gpp-common-managed-element.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index c9645cec4..eb77b6cf3 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -318,8 +318,8 @@ module _3gpp-common-managed-element { if-feature EcmConnectionInfoUnderManagedElement; } - uses ecmap3gpp:NGRANECMappingRuleSubtree { - if-feature EcmConnectionInfoUnderManagedElement; + uses ecmap3gpp:NRECMappingRuleSubtree { + if-feature ECMappingRuleUnderManagedElement; } } } -- GitLab From 693c6f5caeee4f39a848b473b16033a083d23eb7 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 23 Aug 2024 08:59:17 +0000 Subject: [PATCH 113/157] Update _3gpp-nr-nrm-ecmappingrule.yang --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index 949f21289..81519e61c 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -16,7 +16,9 @@ module _3gpp-nr-nrm-ecmappingrule { revision 2024-08-12 { reference CR-1336 ; } grouping NRECMappingRuleGrp { - description "Represents the NRECMappingRule IOC."; + 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 -- GitLab From 26e7f629b4180825a9bef1fdb97ee763046afb15 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 23 Aug 2024 09:00:41 +0000 Subject: [PATCH 114/157] Update _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 7b168c437..7cae7b624 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -184,7 +184,8 @@ module _3gpp-nr-nrm-gnbcucpfunction { leaf nRECMappingRuleRef { type types3gpp:DistinguishedName; - description "DN of a NRECMappingRule."; + description "DN of a NRECMappingRule. An empty value indicates the + NRECMappingRule contained by parent, e.g. ManagedElement, applies."; } } -- GitLab From 089dc6e12c793cc2015905cdceb4c3271a3e81b2 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 23 Aug 2024 09:48:34 +0000 Subject: [PATCH 115/157] Update _3gpp-common-managed-element.yang --- yang-models/_3gpp-common-managed-element.yang | 6 ------ 1 file changed, 6 deletions(-) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index eb77b6cf3..b9c7fa51c 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -189,12 +189,6 @@ module _3gpp-common-managed-element { min-elements 1; type string; } - - leaf nRECMappingRuleRef { - type types3gpp:DistinguishedName; - description "DN of a NRECMappingRule."; - } - } grouping ManagedElementGrp { -- GitLab From 99efbf50a6b60dbb6d0849d0e345298870f9b33e Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 23 Aug 2024 10:00:06 +0000 Subject: [PATCH 116/157] Update _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 7cae7b624..e8ce1c9f8 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -185,7 +185,8 @@ module _3gpp-nr-nrm-gnbcucpfunction { leaf nRECMappingRuleRef { type types3gpp:DistinguishedName; description "DN of a NRECMappingRule. An empty value indicates the - NRECMappingRule contained by parent, e.g. ManagedElement, applies."; + NRECMappingRule contained by parent, e.g. ManagedElement or + SubNetwork, applies."; } } -- GitLab From c921ce0958c7e0cecdd69773f06861a0feca8f05 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 11:18:37 +0000 Subject: [PATCH 117/157] Update _3gpp-5gc-nrm-nwdaffunction.yang correct rev --- yang-models/_3gpp-5gc-nrm-nwdaffunction.yang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang index 5fe7eb7ae..9cd8747e8 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; } @@ -393,4 +394,4 @@ module _3gpp-5gc-nrm-nwdaffunction { uses mf3gpp:ManagedFunctionContainedClasses; } } -} \ No newline at end of file +} -- GitLab From 59e4898c38cdc0be51a5ea9e5b61f1454853eeb8 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 17:04:46 +0000 Subject: [PATCH 118/157] Update _3gpp-5gc-nrm-nwdaffunction.yang --- yang-models/_3gpp-5gc-nrm-nwdaffunction.yang | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang index 9cd8747e8..a5256f4c7 100755 --- a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang @@ -280,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 { @@ -320,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; } -- GitLab From b15e36adcef48ea102e52a1847a6831cf5021994 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 14:16:26 +0000 Subject: [PATCH 119/157] Update _3gpp-5gc-nrm-anlffunction.yang include references to mLModelRefList and aIMLInferenceFunctionRefList --- yang-models/_3gpp-5gc-nrm-anlffunction.yang | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-anlffunction.yang b/yang-models/_3gpp-5gc-nrm-anlffunction.yang index 85673a4c7..be58e7e07 100644 --- a/yang-models/_3gpp-5gc-nrm-anlffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-anlffunction.yang @@ -15,7 +15,8 @@ module _3gpp-5gc-nrm-anlffunction { Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - + + revision 2024-08-06 { reference CR-1332; } revision 2023-11-03 { reference "initial revision"; } grouping AnLFFunctionGrp { @@ -29,6 +30,17 @@ 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 [105])."; + } + leaf-list aIMLInferenceFunctionRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of AIMLInferenceFunction + (See TS 28.105 [105]) ."; + } + } augment "/me3gpp:ManagedElement/nwdaf3gpp:NWDAFFunction" { -- GitLab From 4e94547a7fbda99891087edd7fe7cc1c1887cdff Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 14:26:11 +0000 Subject: [PATCH 120/157] Update _3gpp-5gc-nrm-anlffunction.yang import types3gpp --- yang-models/_3gpp-5gc-nrm-anlffunction.yang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-anlffunction.yang b/yang-models/_3gpp-5gc-nrm-anlffunction.yang index be58e7e07..cb9e94e00 100644 --- a/yang-models/_3gpp-5gc-nrm-anlffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-anlffunction.yang @@ -6,7 +6,8 @@ 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"; -- GitLab From 8b43ea3b8dcc243ab72d88f0c1f6592b41926c7f Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 14:29:44 +0000 Subject: [PATCH 121/157] Update _3gpp-5gc-nrm-anlffunction.yang typo --- yang-models/_3gpp-5gc-nrm-anlffunction.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-anlffunction.yang b/yang-models/_3gpp-5gc-nrm-anlffunction.yang index cb9e94e00..96fa4239c 100644 --- a/yang-models/_3gpp-5gc-nrm-anlffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-anlffunction.yang @@ -6,8 +6,8 @@ module _3gpp-5gc-nrm-anlffunction { import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-top { prefix top3gpp; } - import _3gpp-5gc-nrm-nwdaffunction { prefix nwdaf3gpp; - import _3gpp-common-yang-types { prefix types3gpp; }} + 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"; -- GitLab From 4b3c553b233057c767f6f280b53db8ff373d10c1 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 14:42:02 +0000 Subject: [PATCH 122/157] Update _3gpp-nr-nrm-desmanagementfunction.yang add support for mLModelRefList and AIMLInferenceFunction --- .../_3gpp-nr-nrm-desmanagementfunction.yang | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang index c1201b7fb..f7a673239 100755 --- a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang +++ b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang @@ -9,6 +9,7 @@ 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"; @@ -19,6 +20,7 @@ module _3gpp-nr-nrm-desmanagementfunction { 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,17 @@ 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 [105])."; + } + leaf-list aIMLInferenceFunctionRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of AIMLInferenceFunction + (See TS 28.105 [105]) ."; + } } grouping EsNotAllowedTimePeriodGrp { @@ -200,4 +212,4 @@ module _3gpp-nr-nrm-desmanagementfunction { if-feature subnet3gpp:DESManagementFunction; uses DESManagementFunctionSubtree; } -} \ No newline at end of file +} -- GitLab From f6005b8571b99b6bc3dfb70988b6673c396b1c7b Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 14:47:19 +0000 Subject: [PATCH 123/157] Update _3gpp-nr-nrm-dlbofunction.yang add support for mLModelRefList and aIMLInferenceFunctionRefList --- yang-models/_3gpp-nr-nrm-dlbofunction.yang | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-dlbofunction.yang b/yang-models/_3gpp-nr-nrm-dlbofunction.yang index 6ae29fa50..e19be89a7 100644 --- a/yang-models/_3gpp-nr-nrm-dlbofunction.yang +++ b/yang-models/_3gpp-nr-nrm-dlbofunction.yang @@ -8,6 +8,7 @@ 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"; @@ -18,6 +19,7 @@ module _3gpp-nr-nrm-dlbofunction { 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,16 @@ 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 [105])."; + } + leaf-list aIMLInferenceFunctionRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of AIMLInferenceFunction + (See TS 28.105 [105]) ."; + } } grouping DLBOFunctionSubtree { @@ -101,4 +111,4 @@ module _3gpp-nr-nrm-dlbofunction { if-feature DLBOUnderSubNetwork; uses DLBOFunctionSubtree; } -} \ No newline at end of file +} -- GitLab From 052148388f20a5a894ee4456cc240d6f3da41ee8 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 14:52:35 +0000 Subject: [PATCH 124/157] Update _3gpp-nr-nrm-dmrofunction.yang add support for mLModelRefList and aIMLInferenceFunctionRefList --- yang-models/_3gpp-nr-nrm-dmrofunction.yang | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-dmrofunction.yang b/yang-models/_3gpp-nr-nrm-dmrofunction.yang index ea6ef52b7..3dbdd585b 100755 --- a/yang-models/_3gpp-nr-nrm-dmrofunction.yang +++ b/yang-models/_3gpp-nr-nrm-dmrofunction.yang @@ -8,6 +8,7 @@ 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"; @@ -18,6 +19,7 @@ module _3gpp-nr-nrm-dmrofunction { 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,16 @@ 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 [105])."; + } + leaf-list aIMLInferenceFunctionRefList { + type types3gpp:DistinguishedName; + description "This attribute holds a DN list of AIMLInferenceFunction + (See TS 28.105 [105]) ."; + } } grouping DMROFunctionSubtree { @@ -101,4 +113,4 @@ module _3gpp-nr-nrm-dmrofunction { if-feature subnet3gpp:DMROFunction; uses DMROFunctionSubtree; } -} \ No newline at end of file +} -- GitLab From b0fcbc518f1ea9f8b666e951c250aac94eae39df Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 16:29:55 +0000 Subject: [PATCH 125/157] Update _3gpp-5gc-nrm-anlffunction.yang --- yang-models/_3gpp-5gc-nrm-anlffunction.yang | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-anlffunction.yang b/yang-models/_3gpp-5gc-nrm-anlffunction.yang index 96fa4239c..c516a54c2 100644 --- a/yang-models/_3gpp-5gc-nrm-anlffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-anlffunction.yang @@ -13,12 +13,12 @@ module _3gpp-5gc-nrm-anlffunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the AnLF function in 5GC. For more information about the AnLF, see 3GPP TS 23.288. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; revision 2024-08-06 { reference CR-1332; } - revision 2023-11-03 { reference "initial revision"; } + grouping AnLFFunctionGrp { description "Represents the AnLFFunction IOC"; @@ -34,12 +34,14 @@ module _3gpp-5gc-nrm-anlffunction { leaf-list mLModelRefList { type types3gpp:DistinguishedName; description "This attribute holds a DN list of MLModel ¨ - (See TS 28.105 [105])."; + (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 [105]) ."; + (See TS 28.105)."; + config false; } } -- GitLab From 084001a696595a0a5547c23b10485fad18f6a4f1 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 16:30:44 +0000 Subject: [PATCH 126/157] Update _3gpp-nr-nrm-desmanagementfunction.yang --- yang-models/_3gpp-nr-nrm-desmanagementfunction.yang | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang index f7a673239..6256edbac 100755 --- a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang +++ b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang @@ -16,7 +16,7 @@ module _3gpp-nr-nrm-desmanagementfunction { 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)"; @@ -145,12 +145,14 @@ module _3gpp-nr-nrm-desmanagementfunction { leaf-list mLModelRefList { type types3gpp:DistinguishedName; description "This attribute holds a DN list of MLModel ¨ - (See TS 28.105 [105])."; + (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 [105]) ."; + (See TS 28.105) ."; + config false; } } -- GitLab From 102a6a6f57a034fa88bcaa864d0543b2a1388528 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 16:31:34 +0000 Subject: [PATCH 127/157] Update _3gpp-nr-nrm-dlbofunction.yang --- yang-models/_3gpp-nr-nrm-dlbofunction.yang | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-dlbofunction.yang b/yang-models/_3gpp-nr-nrm-dlbofunction.yang index e19be89a7..ecf970ba4 100644 --- a/yang-models/_3gpp-nr-nrm-dlbofunction.yang +++ b/yang-models/_3gpp-nr-nrm-dlbofunction.yang @@ -15,7 +15,7 @@ module _3gpp-nr-nrm-dlbofunction { 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)"; @@ -72,12 +72,14 @@ module _3gpp-nr-nrm-dlbofunction { leaf-list mLModelRefList { type types3gpp:DistinguishedName; description "This attribute holds a DN list of MLModel ¨ - (See TS 28.105 [105])."; + (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 [105]) ."; + (See TS 28.105) ."; + config false; } } -- GitLab From c61e586039f22f91dded0618dcf1f9293a787ef3 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 16:32:44 +0000 Subject: [PATCH 128/157] Update _3gpp-nr-nrm-dmrofunction.yang --- yang-models/_3gpp-nr-nrm-dmrofunction.yang | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-dmrofunction.yang b/yang-models/_3gpp-nr-nrm-dmrofunction.yang index 3dbdd585b..74fe98c73 100755 --- a/yang-models/_3gpp-nr-nrm-dmrofunction.yang +++ b/yang-models/_3gpp-nr-nrm-dmrofunction.yang @@ -15,7 +15,7 @@ module _3gpp-nr-nrm-dmrofunction { 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)"; @@ -70,12 +70,14 @@ module _3gpp-nr-nrm-dmrofunction { leaf-list mLModelRefList { type types3gpp:DistinguishedName; description "This attribute holds a DN list of MLModel ¨ - (See TS 28.105 [105])."; + (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 [105]) ."; + (See TS 28.105) ."; + config false; } } -- GitLab From 81817a882bfca67808385f6442980e6e78262736 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Fri, 4 Oct 2024 21:18:49 +0200 Subject: [PATCH 129/157] Updated capitalization to follow small attribute table --- yang-models/_3gpp-common-trace.yang | 44 ++++++++++++++--------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index bf194a6ea..e6a22bde7 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -559,7 +559,7 @@ module _3gpp-common-trace { } } - leaf-list listOfNETypes { + leaf-list listOfNeTypes { type enumeration { enum MSC_SERVER; enum SGSN; @@ -680,15 +680,15 @@ module _3gpp-common-trace { -reportingTrigger: conditional for M1 in LTE or NR and M1/M2 in UMTS, -eventThreshold: conditional for A2 event reporting or A2 event triggered periodic reporting, - -collectionPeriodRrmNR: conditional for M4 and M5 in NR, + -collectionPeriodRRMNR: conditional for M4 and M5 in NR, -collectionPeriodM6NR: conditional for M6 in NR, -collectionPeriodM7NR: conditional for M7 in NR, - -collectionPeriodRrmLte (conditional for M3 in LTE), + -collectionPeriodRRMLTE (conditional for M3 in LTE), -measurementPeriodLTE (conditional for M4 and M5 in LTE), - -collectionPeriodM6Lte (conditional for M6 in LTE), - -collectionPeriodM7Lte (conditional for M7 in LTE), - -collectionPeriodRrmUmts (conditional for M4 and M5 in UMTS), - -measurementPeriodUmts (conditional for M6 and M7 in UMTS), + -collectionPeriodM6LTE (conditional for M6 in LTE), + -collectionPeriodM7LTE (conditional for M7 in LTE), + -collectionPeriodRRMUMTS (conditional for M4 and M5 in UMTS), + -measurementPeriodUMTS (conditional for M6 and M7 in UMTS), -measurementQuantity (conditional for 1F event reporting), -beamLevelMeasurement (conditional for M1 in NR), -excessPacketDelayThresholds (conditional for M6 UL measurement in NR). @@ -726,8 +726,8 @@ module _3gpp-common-trace { configuration, see TS 38.321, TS 36.321 and TS 38.331, TS 36.331. For measurement M4 in UMTS, reporting is either according to RRM configuration, see TS 25.321 and TS 25.331 or periodic or event - triggered periodic using parameter collectionPeriodRrmUmts and - eventThresholdUphUmts. + triggered periodic using parameter collectionPeriodRRMUMTS and + eventThresholdUphUMTS. - For measurement M3 in UMTS, the reporting is done upon availability, see TS 37.320. @@ -736,9 +736,9 @@ 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 + 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."; @@ -834,7 +834,7 @@ module _3gpp-common-trace { reference "Clauses 5.10.7 and 5.10.7a of 3GPP TS 32.422"; } - leaf collectionPeriodRrmNr { + leaf collectionPeriodRRMNR { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { @@ -848,7 +848,7 @@ module _3gpp-common-trace { reference "Clause 5.10.30 of 3GPP TS 32.422"; } - leaf collectionPeriodM6Nr { + leaf collectionPeriodM6NR { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type enumeration { @@ -874,7 +874,7 @@ module _3gpp-common-trace { reference "clause 5.10.34 of TS 32.422"; } - leaf collectionPeriodM7Nr { + leaf collectionPeriodM7NR { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { @@ -887,7 +887,7 @@ module _3gpp-common-trace { reference "clause 5.10.35 of TS 32.422"; } - leaf collectionPeriodRrmLte { + leaf collectionPeriodRRMLTE { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { @@ -918,7 +918,7 @@ module _3gpp-common-trace { reference "Clause 5.10.23 of 3GPP TS 32.422"; } - leaf collectionPeriodM6Lte { + leaf collectionPeriodM6LTE { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { @@ -932,7 +932,7 @@ module _3gpp-common-trace { reference "Clause 5.10.32 of TS 32.422 "; } - leaf collectionPeriodM7Lte { + leaf collectionPeriodM7LTE { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint16 { @@ -945,7 +945,7 @@ module _3gpp-common-trace { reference "Clause 5.10.33 of TS 32.422 ."; } - leaf eventThresholdUphUmts { + leaf eventThresholdUphUMTS { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint16 { @@ -958,7 +958,7 @@ module _3gpp-common-trace { reference "5.10.39 of TS 32.422"; } - leaf collectionPeriodRrmUmts { + leaf collectionPeriodRRMUMTS { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { @@ -973,7 +973,7 @@ module _3gpp-common-trace { reference "Clause 5.10.21 of 3GPP TS 32.422"; } - leaf measurementPeriodUmts { + leaf measurementPeriodUMTS { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + 'or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { @@ -1443,7 +1443,7 @@ 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; -- GitLab From 5529176001a5a75c1bb30cbf2289097d2da849e7 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Fri, 4 Oct 2024 23:23:19 +0200 Subject: [PATCH 130/157] update basics --- yang-models/_3gpp-5gc-nrm-amffunction.yang | 10 ++++++++-- yang-models/_3gpp-common-trace.yang | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index 310e71835..c4c48391d 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -17,6 +17,7 @@ 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; } @@ -247,8 +248,13 @@ module _3gpp-5gc-nrm-amffunction { 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-common-trace.yang b/yang-models/_3gpp-common-trace.yang index e6a22bde7..7108cb6a6 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -25,6 +25,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; + 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; } -- GitLab From 2563e7c7ef09a9ed376f33d2629ec929485e91fd Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Fri, 4 Oct 2024 23:43:30 +0200 Subject: [PATCH 131/157] update3 --- yang-models/_3gpp-5gc-nrm-amffunction.yang | 28 ++++++++++------------ 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index c4c48391d..7bb7376b7 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -165,16 +165,15 @@ module _3gpp-5gc-nrm-amffunction { 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; @@ -186,15 +185,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 { -- GitLab From 736eb3e4d660889e1d3eb6a52c7f4beb8c049821 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 16 Oct 2024 03:07:28 +0530 Subject: [PATCH 132/157] Update Amffunction 28.541 CR 1389 --- yang-models/_3gpp-5g-common-yang-types.yang | 42 ++- yang-models/_3gpp-5gc-nrm-amffunction.yang | 352 +++++++++++++++++++- 2 files changed, 386 insertions(+), 8 deletions(-) diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang index 08b8fc721..75786fb27 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-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index 7bb7376b7..b28a1a521 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"; @@ -23,11 +26,10 @@ module _3gpp-5gc-nrm-amffunction { 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 @@ -117,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{ @@ -132,6 +133,7 @@ module _3gpp-5gc-nrm-amffunction { description "this relies on the choice of GlobalRanNodeID"; } key "GlobalRanNodeIDValue"; + uses NTNGlobalRanNodeIDGrp; } leaf satelliteBackhaulCategory{ @@ -161,6 +163,296 @@ 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; @@ -212,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."; @@ -221,7 +546,7 @@ module _3gpp-5gc-nrm-amffunction { } key "GlobalRanNodeIDValue"; min-elements 1; - uses satelliteBackhaulInfo; + uses SatelliteBackhaulInfoGrp; } leaf-list mdtUserConsentReqList { @@ -242,6 +567,19 @@ 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" { -- GitLab From e6371b3b332d970eb4b22d16855799fe1a1ce920 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 16 Oct 2024 18:42:53 +0530 Subject: [PATCH 133/157] Corrected EutraNetwork containment and inheritance --- yang-models/_3gpp-nr-nrm-eutranetwork.yang | 54 +++++++--------------- 1 file changed, 16 insertions(+), 38 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-eutranetwork.yang b/yang-models/_3gpp-nr-nrm-eutranetwork.yang index 3958b9c1a..1d3d9921e 100755 --- a/yang-models/_3gpp-nr-nrm-eutranetwork.yang +++ b/yang-models/_3gpp-nr-nrm-eutranetwork.yang @@ -3,20 +3,21 @@ module _3gpp-nr-nrm-eutranetwork { namespace "urn:3gpp:sa5:_3gpp-nr-nrm-eutranetwork"; prefix "eutranet3gpp"; - import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-top { prefix top3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the EUtraNetwork Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + 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 2023-09-18 { reference CR-1043 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2024-10-06 { reference CR-1389; } + revision 2023-09-18 { reference CR-1043; } + revision 2019-06-17 { reference "Initial revision"; } feature ExternalsUnderEUtraNetwork { description "Classes representing external entities like EUtranFrequency, @@ -24,40 +25,17 @@ module _3gpp-nr-nrm-eutranetwork { } grouping EUtraNetworkGrp { - description "Represents the EUtraNetwork IOC."; - reference "3GPP TS 28.541"; - uses subnet3gpp:SubNetworkGrp; + description "Represents the EUtraNetwork IOC. + It has no attributes, just the ones inherited from Top."; } - list EUtraNetwork { - description "A subnetwork containing gNB external E-UTRAN entities."; - reference "3GPP TS 28.541"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses EUtraNetworkGrp; - leaf-list parents { - description "Reference to all containg EUtraNetwork instances - in strict order from the root EUtraNetwork down to the immediate - parent EUtraNetwork. - If EUtraNetworks form a containment hierarchy this is - modeled using references between the child EUtraNetwork and the parent - EUtraNetworks. - This reference MUST NOT be present for the top level EUtraNetwork and - MUST be present for other EUtraNetworks."; - type leafref { - path "../../../EUtraNetwork/id"; - } - } - - leaf-list containedChildren{ - description "Reference to all directly contained EUtraNetwork instances. - If EUtraNetworks form a containment hierarchy this is - modeled using references between the child EUtraNetwork and the parent - EUtraNetwork."; - type leafref { - path "../../../EUtraNetwork/id"; - } + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction" { + list EUtraNetwork { + description "A subnetwork containing gNB external E-UTRAN entities."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses EUtraNetworkGrp; } } } -- GitLab From 03018109f157a72cf2b95e3a40f69bd7713076c2 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 17 Oct 2024 10:10:25 +0530 Subject: [PATCH 134/157] removed incomplete changes to _3gpp-nr-nrm-eutranetwork.yang --- yang-models/_3gpp-nr-nrm-eutranetwork.yang | 54 +++++++--------------- 1 file changed, 16 insertions(+), 38 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-eutranetwork.yang b/yang-models/_3gpp-nr-nrm-eutranetwork.yang index 3958b9c1a..1d3d9921e 100755 --- a/yang-models/_3gpp-nr-nrm-eutranetwork.yang +++ b/yang-models/_3gpp-nr-nrm-eutranetwork.yang @@ -3,20 +3,21 @@ module _3gpp-nr-nrm-eutranetwork { namespace "urn:3gpp:sa5:_3gpp-nr-nrm-eutranetwork"; prefix "eutranet3gpp"; - import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-top { prefix top3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the EUtraNetwork Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + 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 2023-09-18 { reference CR-1043 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2024-10-06 { reference CR-1389; } + revision 2023-09-18 { reference CR-1043; } + revision 2019-06-17 { reference "Initial revision"; } feature ExternalsUnderEUtraNetwork { description "Classes representing external entities like EUtranFrequency, @@ -24,40 +25,17 @@ module _3gpp-nr-nrm-eutranetwork { } grouping EUtraNetworkGrp { - description "Represents the EUtraNetwork IOC."; - reference "3GPP TS 28.541"; - uses subnet3gpp:SubNetworkGrp; + description "Represents the EUtraNetwork IOC. + It has no attributes, just the ones inherited from Top."; } - list EUtraNetwork { - description "A subnetwork containing gNB external E-UTRAN entities."; - reference "3GPP TS 28.541"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses EUtraNetworkGrp; - leaf-list parents { - description "Reference to all containg EUtraNetwork instances - in strict order from the root EUtraNetwork down to the immediate - parent EUtraNetwork. - If EUtraNetworks form a containment hierarchy this is - modeled using references between the child EUtraNetwork and the parent - EUtraNetworks. - This reference MUST NOT be present for the top level EUtraNetwork and - MUST be present for other EUtraNetworks."; - type leafref { - path "../../../EUtraNetwork/id"; - } - } - - leaf-list containedChildren{ - description "Reference to all directly contained EUtraNetwork instances. - If EUtraNetworks form a containment hierarchy this is - modeled using references between the child EUtraNetwork and the parent - EUtraNetwork."; - type leafref { - path "../../../EUtraNetwork/id"; - } + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction" { + list EUtraNetwork { + description "A subnetwork containing gNB external E-UTRAN entities."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses EUtraNetworkGrp; } } } -- GitLab From 64be39e192dd9109ceae0213b5cbdbdf12bf848f Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 17 Oct 2024 10:24:56 +0530 Subject: [PATCH 135/157] removed incomplete changes to _3gpp-nr-nrm-eutranetwork.yang --- yang-models/_3gpp-nr-nrm-eutranetwork.yang | 54 +++++++++++++++------- 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-eutranetwork.yang b/yang-models/_3gpp-nr-nrm-eutranetwork.yang index 1d3d9921e..3958b9c1a 100755 --- a/yang-models/_3gpp-nr-nrm-eutranetwork.yang +++ b/yang-models/_3gpp-nr-nrm-eutranetwork.yang @@ -3,21 +3,20 @@ module _3gpp-nr-nrm-eutranetwork { namespace "urn:3gpp:sa5:_3gpp-nr-nrm-eutranetwork"; prefix "eutranet3gpp"; - import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } - import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } organization "3GPP SA5"; - contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the EUtraNetwork Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2024-10-06 { reference CR-1389; } - revision 2023-09-18 { reference CR-1043; } - revision 2019-06-17 { reference "Initial revision"; } + revision 2023-09-18 { reference CR-1043 ; } + revision 2019-06-17 { + description "Initial revision"; + } feature ExternalsUnderEUtraNetwork { description "Classes representing external entities like EUtranFrequency, @@ -25,17 +24,40 @@ module _3gpp-nr-nrm-eutranetwork { } grouping EUtraNetworkGrp { - description "Represents the EUtraNetwork IOC. - It has no attributes, just the ones inherited from Top."; + description "Represents the EUtraNetwork IOC."; + reference "3GPP TS 28.541"; + uses subnet3gpp:SubNetworkGrp; } - augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction" { - list EUtraNetwork { - description "A subnetwork containing gNB external E-UTRAN entities."; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses EUtraNetworkGrp; + list EUtraNetwork { + description "A subnetwork containing gNB external E-UTRAN entities."; + reference "3GPP TS 28.541"; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses EUtraNetworkGrp; + leaf-list parents { + description "Reference to all containg EUtraNetwork instances + in strict order from the root EUtraNetwork down to the immediate + parent EUtraNetwork. + If EUtraNetworks form a containment hierarchy this is + modeled using references between the child EUtraNetwork and the parent + EUtraNetworks. + This reference MUST NOT be present for the top level EUtraNetwork and + MUST be present for other EUtraNetworks."; + type leafref { + path "../../../EUtraNetwork/id"; + } + } + + leaf-list containedChildren{ + description "Reference to all directly contained EUtraNetwork instances. + If EUtraNetworks form a containment hierarchy this is + modeled using references between the child EUtraNetwork and the parent + EUtraNetwork."; + type leafref { + path "../../../EUtraNetwork/id"; + } } } } -- GitLab From b6a680190422e4530eb2a80bf3346eaf1d25d3f8 Mon Sep 17 00:00:00 2001 From: ligan Date: Tue, 1 Oct 2024 15:03:54 +0000 Subject: [PATCH 136/157] TS28.623_Rel18_CR0437_Correct _wrong_CR _number_in _managed_ element _YANG _file --- yang-models/_3gpp-common-managed-element.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index b9c7fa51c..402a9bdc5 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -34,7 +34,7 @@ module _3gpp-common-managed-element { 3GPP TS 28.620 Umbrella Information Model (UIM)"; - revision 2024-08-12 { reference CR-1336 ; } + revision 2024-10-01 { reference CR-0437 ; } revision 2024-01-30 { reference CR-0328 ; } revision 2023-11-14 { reference CR-0305 ; } revision 2023-09-18 { reference CR-0271 ; } -- GitLab From 5589b3fcfd639594c23dd4b6f08c927896f811f3 Mon Sep 17 00:00:00 2001 From: ligan Date: Fri, 4 Oct 2024 10:23:15 +0000 Subject: [PATCH 137/157] TS28.623_Rel18_CR0437_Correct_ wrong_ CR_ number_ in_ managed_ element _YANG _file --- yang-models/_3gpp-common-managed-element.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index 402a9bdc5..eaa8dbdb7 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -34,7 +34,7 @@ module _3gpp-common-managed-element { 3GPP TS 28.620 Umbrella Information Model (UIM)"; - revision 2024-10-01 { reference CR-0437 ; } + 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 ; } -- GitLab From 8bdfff97f1343d16c8d7bd6e30159cfc40507792 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Mon, 25 Nov 2024 19:31:02 +0000 Subject: [PATCH 138/157] YANG_Corrections_28.623_CR0487_Rel18_Keyless-list into Integration --- yang-models/_3gpp-common-measurements.yang | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index e2cf97b8a..a89fc558f 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -56,6 +56,7 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; + revision 2024-11-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"; } @@ -187,6 +188,7 @@ module _3gpp-common-measurements { grouping SupportedPerfMetricGroupGrp { list SupportedPerfMetricGroups { config false; + key idx; description "Captures a group of supported performance metrics and associated parameters related to their production and reporting. A SupportedPerfMetricGroup attribute which is part of an MOI may @@ -195,6 +197,8 @@ module _3gpp-common-measurements { can specify supported metrics for contained ManagedFunctions like a GNBDUFunction."; + leaf idx { type uint32; } + leaf-list performanceMetrics { type string; min-elements 1; -- GitLab From e6f9b82facb426ed1b06fd0aeb5ce853ab4f56be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Mon, 25 Nov 2024 19:37:10 +0000 Subject: [PATCH 139/157] TS28.623_Rel18_CR0470_Correction_to_AreaScope --- yang-models/_3gpp-common-qmcjob.yang | 52 +++++----------------------- yang-models/_3gpp-common-trace.yang | 40 ++++++--------------- 2 files changed, 19 insertions(+), 73 deletions(-) diff --git a/yang-models/_3gpp-common-qmcjob.yang b/yang-models/_3gpp-common-qmcjob.yang index bd46a0360..9ae62e214 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-trace.yang b/yang-models/_3gpp-common-trace.yang index 7108cb6a6..d27c56607 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -25,6 +25,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; + 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"; } @@ -107,9 +108,7 @@ module _3gpp-common-trace { grouping AreaScopeGrp { description "Represents the AreaScope dataType. - This <> defines the area scope of MDT and QoE. - The Area Scope for MDT is specified in clause 5.10.2 of TS 32.422. - The Area Scope for QoE is specified in clause 5.4 of TS 28.405"; + This <> defines an area scope"; choice AreaScopeChoice { leaf-list eutraCellIdList { @@ -1430,13 +1429,8 @@ 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 @@ -1458,21 +1452,9 @@ module _3gpp-common-trace { list areaScope { key "idx"; leaf idx { type uint32 ; } - description "It specifies the area where data shall be collected. - List of eNB/list of gNB/eNB/gNB for RLF or RCEF. - - List of cells/TA/LA/RA for signaling based MDT or management - based Logged MDT. - - List of cells for management based Immediate MDT. - - List of NPN IDs for management based MDT. - - Cell, TA, LA, RA are mutually exclusive. - - This attribute shall be present if MDT is supported."; - reference "Clause 5.10.2 of 3GPP TS 32.422"; - + description "It specifies the area where data shall be collected."; + min-elements 0; + max-elements 1; uses AreaScopeGrp; } @@ -1703,22 +1685,22 @@ module _3gpp-common-trace { ManagedEntity playing a role of ServinGWFunction. In case of signaling based Trace/MDT, the traceTarget attribute shall - be able to carry (IMSI or IMEI(SV)or SUPI), the mDTAreaScope attribute + be able to carry (IMSI or IMEI(SV)or SUPI), the areaScope attribute shall be able to carry a list of (cell or E-UtranCell or NRCellDU or TA/LA/RA). In case of management based Immediate MDT, the traceTarget attribute - shall be null value, the mDTAreaScope attribute shall carry a list of + shall be null value, the areaScope attribute shall carry a list of (Utrancell or E-UtranCell or NRCellDU). In case of management based Logged MDT, the traceTarget attribute shall carry an eBs or a RNC or gNBs. The Logged MDT should be initiated - on the specified eNB or RNC or gNB in traceTarget. The mDTAreaScope + on the specified eNB or RNC or gNB in traceTarget. The areaScope attribute shall carry a list of (Utrancell or E-UtranCell or NRCellDU or TA/LA/RA). In case of RLF reporting, or RCEF reporting, the traceTarget - attribute shall be null value, the mDTAreaScope attribute shall carry + attribute shall be null value, the areaScope attribute shall carry one or list of eNBs/gNBs"; reference "3GPP TS 32.422"; } -- GitLab From c1efffcc49dd91563eb47248e4b1bbeb262b376a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Mon, 25 Nov 2024 21:21:54 +0000 Subject: [PATCH 140/157] TS28.623_Rel18_CR0473_Remove_unneeded_fileLocation_attribute --- yang-models/_3gpp-common-filemanagement.yang | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-common-filemanagement.yang b/yang-models/_3gpp-common-filemanagement.yang index 1e03291af..d9b5afa66 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 { -- GitLab From d970441ba9ac4c314d4802b7969fe6d4c0c9dada Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 18 Dec 2024 06:50:27 +0000 Subject: [PATCH 141/157] Integration rel18 sa5 158 yaml to Release branch after SA#106 --- OpenAPI/TS28104_MdaNrm.yaml | 33 ++++- OpenAPI/TS28104_MdaReport.yaml | 6 +- OpenAPI/TS28105_AiMlNrm.yaml | 35 ++++-- OpenAPI/TS28312_IntentNrm.yaml | 18 ++- OpenAPI/TS28532_ProvMnS.yaml | 9 +- OpenAPI/TS28536_CoslaNrm.yaml | 8 +- OpenAPI/TS28538_EdgeNrm.yaml | 13 +- OpenAPI/TS28541_5GcNrm.yaml | 71 +++++------ OpenAPI/TS28541_NrNrm.yaml | 131 ++++++++++++-------- OpenAPI/TS28541_SliceNrm.yaml | 33 +++-- OpenAPI/TS28623_ComDefs.yaml | 32 +++-- OpenAPI/TS28623_FileManagementNrm.yaml | 4 +- OpenAPI/TS28623_GenericNrm.yaml | 4 +- OpenAPI/TS28623_PmControlNrm.yaml | 4 +- OpenAPI/TS28623_SubscriptionControlNrm.yaml | 8 +- OpenAPI/TS28623_TraceControlNrm.yaml | 44 +++---- 16 files changed, 280 insertions(+), 173 deletions(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index 4290465aa..2f0530b4b 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: MDA NRM - version: 18.5.0 + version: 18.6.0 description: >- OAS 3.0.1 specification of the MDA NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -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,8 +52,9 @@ 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 @@ -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: diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index b57be4d1a..f3b97098d 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: MDA Report - version: 18.3.0 + version: 18.6.0 description: >- OAS 3.0.1 specification of the MDA Report © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -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 4bdb73a0e..e85c31cb2 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: AI/ML NRM - version: 18.5.0 + version: 18.6.0 description: >- OAS 3.0.1 specification of the AI/ML NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -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: @@ -406,7 +421,7 @@ components: - type: object properties: aIMLInferenceName: - type: string + $ref: '#/components/schemas/AIMLInferenceName' policyForLoading: $ref: '#/components/schemas/AIMLManagementPolicy' mLModelRef: @@ -445,7 +460,7 @@ components: mLModelId: type: string aIMLInferenceName: - type: string + $ref: '#/components/schemas/AIMLInferenceName' mLModelVersion: type: string expectedRunTimeContext: @@ -455,7 +470,9 @@ components: runTimeContext: $ref: '#/components/schemas/MLContext' supportedPerformanceIndicators: - $ref: '#/components/schemas/SupportedPerfIndicator' + type: array + items: + $ref: '#/components/schemas/SupportedPerfIndicator' mLCapabilitiesInfoList: type: array items: diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 3d018cb18..f353412f6 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Intent NRM - version: 18.5.0 + version: 18.6.0 description: >- OAS 3.0.1 definition of the Intent NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -324,7 +324,7 @@ components: properties: intentFulfilmentInfo: $ref: '#/components/schemas/FulfilmentInfo' - expectationFulfilmentResult: + expectationFulfilmentResults: type: array items: $ref: '#/components/schemas/ExpectationFulfilmentResult' @@ -340,7 +340,7 @@ components: type: string expectationFulfilmentInfo: $ref: '#/components/schemas/FulfilmentInfo' - targetFulfilmentResult: + targetFulfilmentResults: type: array items: $ref: '#/components/schemas/TargetFulfilmentResult' @@ -410,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 116dfc4b7..ce913eb9a 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 54d2c5898..1efd9ca6d 100755 --- a/OpenAPI/TS28536_CoslaNrm.yaml +++ b/OpenAPI/TS28536_CoslaNrm.yaml @@ -2,7 +2,7 @@ openapi: 3.0.1 info: title: coslaNrm - version: 18.2.0 + version: 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,7 +157,9 @@ components: controlLoopLifeCyclePhase: $ref: '#/components/schemas/ControlLoopLifeCyclePhase' aCCLDisallowedList: - $ref: '#/components/schemas/ACCLDisallowedAttributes' + type: array + items: + $ref: '#/components/schemas/ACCLDisallowedAttributes' networkSliceRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' networkSliceSubnetRef: diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index a87137ee0..919cf25b4 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.8.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). @@ -121,6 +121,7 @@ components: enum: - ENABLED - DISABLED + - OVERLOAD_WARNING ResourceReservationRequirement: type: object properties: @@ -153,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: @@ -385,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 9ed184190..82448ccc6 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP 5GC NRM - version: 18.9.0 + version: 18.10.0 description: >- OAS 3.0.1 specification of the 5GC NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -106,7 +106,7 @@ components: $ref: '#/components/schemas/IpEndPoint' apiPrefix: type: string - allowedPlmns: + allowedPlMNs: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' @@ -114,7 +114,7 @@ components: type: array items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' - allowedNssais: + allowedNSSAIs: type: array items: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' @@ -223,7 +223,7 @@ components: ManagedNFProfile: type: object properties: - nfInstanceID: + nfInstanceId: type: string interPlmnFqdn: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' @@ -1614,13 +1614,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 @@ -2293,14 +2293,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 @@ -2319,7 +2319,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 @@ -2329,34 +2334,24 @@ components: blockedLocationInfoList: type: array items: - $ref: '#/components/schemas/BlockedLocationInfoList' - minItems: 1 - BlockedLocationInfoList: + $ref: '#/components/schemas/BlockedLocationInfo' + BlockedLocationInfo: description: location for which the PLMN access restrictions are to be applied in case of NTN type: object properties: blockedLocation: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' - blockedDur: - $ref: '#/components/schemas/TimeDuration' + blockedDurWindow: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' blockedSlice: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' - TimeDuration: - description: location for which the PLMN access restrictions are to be applied in case of NTN - type: object - properties: - blockedDurStartTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - blockedDurEndTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - 5GDdnmfInfo: description: Information of an 5G DDNMF NF Instance type: object required: - - plmnId + - plMNId properties: - plmnId: + plMNId: $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId' ImsiRange: description: > @@ -2575,7 +2570,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' @@ -2630,7 +2625,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 @@ -2688,7 +2683,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 @@ -3052,8 +3047,8 @@ components: $ref: '#/components/schemas/ManagedNFProfile' commModelList: $ref: '#/components/schemas/CommModelList' - nTNPLMNInfoList: - $ref: '#/components/schemas/NTNPLMNRestrictionsInfo' + nTNPLMNRestrictionsList: + $ref: '#/components/schemas/NTNPLMNRestrictionsList' amfInfo: $ref: '#/components/schemas/AmfInfo' sliceExpiryInfo: @@ -4457,7 +4452,7 @@ components: allOf: - type: object properties: - FiveQiDscpMappingList: + fiveQiDscpMappingList: type: array items: $ref: '#/components/schemas/FiveQiDscpMapping' diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 11e810bb7..751378165 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: NR NRM - version: 18.9.0 + version: 18.10.0 description: >- OAS 3.0.1 specification of the NR NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -109,7 +109,7 @@ components: MappingSetIDBackhaulAddress: type: object properties: - setID: + setId: type: integer backhaulAddress: $ref: '#/components/schemas/BackhaulAddress' @@ -167,10 +167,19 @@ components: type: integer minimum: 0 maximum: 100 - numberOfPreamblesSent: - type: integer - minimum: 0 - maximum: 200 + maxNumberOfPreamblesSent: + enum: + - n3 + - n4 + - n5 + - n6 + - n7 + - n8 + - n10 + - n20 + - n50 + - n100 + - n200 UeAccDelayProbabilityDist: type: array @@ -305,23 +314,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 +349,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 +543,7 @@ components: type: array items: $ref: '#/components/schemas/RimRSReportInfo' - TceMappingInfo: + TceIDMappingInfo: type: object properties: TceIPAddress: @@ -574,10 +554,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: @@ -948,9 +928,11 @@ components: xnHOBlackList: $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 +949,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: @@ -1173,7 +1157,7 @@ components: type: integer minimum: 0 maximum: 3279165 - ssbSubCarrierSpacing: + sSBSubCarrierSpacing: $ref: '#/components/schemas/SsbSubCarrierSpacing' multiFrequencyBandListNR: type: integer @@ -1335,7 +1319,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: @@ -1372,15 +1360,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: @@ -1435,15 +1431,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: @@ -1718,6 +1722,10 @@ components: $ref: '#/components/schemas/NRFrequency-Multiple' ExternalGnbCuCpFunction: $ref: '#/components/schemas/ExternalGnbCuCpFunction-Multiple' + ExternalGnbCuUpFunction: + $ref: '#/components/schemas/ExternalGnbCuUpFunction-Multiple' + ExternalGnbDuFunction: + $ref: '#/components/schemas/ExternalGnbDuFunction-Multiple' ExternalGnbCuUpFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -2053,6 +2061,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: @@ -2211,6 +2235,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 --------------------------------- @@ -2278,4 +2306,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 121dc8f67..215139ba0 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 f5985b380..8c62eb9d1 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Common Type Definitions - version: 18.7.0 + version: 18.9.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). @@ -106,16 +106,17 @@ components: $ref: '#/components/schemas/Longitude' altitude: $ref: '#/components/schemas/Float' - ConvexGeoPolygon: + GeoPolygon: type: array items: $ref: '#/components/schemas/GeoCoordinate' - minItems: 3 + minItems: 1 GeoArea: - type: object - properties: - convexGeoPolygon: - $ref: '#/components/schemas/ConvexGeoPolygon' + oneOf: + - type: object + properties: + geoPolygon: + $ref: '#/components/schemas/GeoCoordinate' GeoAreaToCellMapping: type: object properties: @@ -238,6 +239,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 +305,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 a0b20fe33..4a84bd523 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 081978338..c0e76d70c 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.8.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). @@ -207,7 +207,7 @@ components: This data type is the "ProcessMonitor" data type without specialisations. type: object properties: - jobId: + id: type: string status: type: string diff --git a/OpenAPI/TS28623_PmControlNrm.yaml b/OpenAPI/TS28623_PmControlNrm.yaml index 23581d777..a53978b09 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 e808716e6..479f33874 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.8.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). @@ -29,7 +29,9 @@ components: - type: object properties: dataNodeSelector: - type: string + oneOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionBasic' + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionAdvanced' #-------- Definition of concrete IOCs -------------------------------------------- NtfSubscriptionControl-Single: @@ -49,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 5806dc392..8d3a24b0a 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.8.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). @@ -808,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 @@ -1377,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: @@ -1390,7 +1393,9 @@ components: type: object properties: ueCoreMeasurements: - type: string + type: array + items: + type: string ueCoreMeasGranularityPeriod: type: integer nfTypeToMeasure: @@ -1400,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: @@ -1467,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: -- GitLab From 24d44b0d2df759bb6337cc89d17305e42a4feeb3 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Wed, 15 Jan 2025 21:34:17 +0000 Subject: [PATCH 142/157] Update 3 files - /yang-models/_3gpp-common-managementdatacollection.yang - /yang-models/_3gpp-common-trace.yang - /yang-models/_3gpp-common-measurements.yang --- ..._3gpp-common-managementdatacollection.yang | 8 ++----- yang-models/_3gpp-common-measurements.yang | 22 +++++-------------- yang-models/_3gpp-common-trace.yang | 10 ++++++++- 3 files changed, 16 insertions(+), 24 deletions(-) diff --git a/yang-models/_3gpp-common-managementdatacollection.yang b/yang-models/_3gpp-common-managementdatacollection.yang index 2a6ffea33..8ca7a37ec 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 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 a89fc558f..ca74cfe14 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -56,6 +56,7 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; + revision 2025-02-06 { reference CR-0460; } revision 2024-11-06 { reference CR-0487; } revision 2024-05-06 { reference CR-0359; } revision 2024-02-24 { reference CR-0346; } @@ -93,13 +94,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."; @@ -208,11 +204,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 + fthe bullet 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). @@ -282,11 +274,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 + 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-trace.yang b/yang-models/_3gpp-common-trace.yang index d27c56607..ae3eff791 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -25,6 +25,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; + 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"; } @@ -1510,7 +1511,14 @@ module _3gpp-common-trace { leaf-list ueCoreMeasurements { type string; - description "It specifies the List of 5GC UE level measurements."; + 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 non-3GPP specified 5GC UE level measurements the name is defined + elsewhere."; } leaf ueCoreMeasGranularityPeriod { -- GitLab From 89c1c26f4ab235c1e6d54bbb3acd191015e56713 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Wed, 15 Jan 2025 21:37:25 +0000 Subject: [PATCH 143/157] Update file _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index ae3eff791..0a1201721 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -1430,7 +1430,8 @@ 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 attribute areaScope defines the area scope of MDT, which is specified in clause 5.10.2 of TS 32.422. The + 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 -- GitLab From 9101fb783afb8e8c226e13858303908579b6822f Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Wed, 15 Jan 2025 22:04:07 +0000 Subject: [PATCH 144/157] Update 2 files - /yang-models/_3gpp-common-measurements.yang - /yang-models/_3gpp-common-managementdatacollection.yang --- yang-models/_3gpp-common-managementdatacollection.yang | 2 +- yang-models/_3gpp-common-measurements.yang | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-common-managementdatacollection.yang b/yang-models/_3gpp-common-managementdatacollection.yang index 8ca7a37ec..654694558 100644 --- a/yang-models/_3gpp-common-managementdatacollection.yang +++ b/yang-models/_3gpp-common-managementdatacollection.yang @@ -214,7 +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 bullet e) of the measurement definition. + 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 ca74cfe14..29d5ff7e7 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -56,7 +56,7 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; - revision 2025-02-06 { reference CR-0460; } + revision 2025-02-05 { reference CR-0460; } revision 2024-11-06 { reference CR-0487; } revision 2024-05-06 { reference CR-0359; } revision 2024-02-24 { reference CR-0346; } @@ -204,7 +204,7 @@ module _3gpp-common-measurements { Measurements are identified by name. For measurements defined in TS 28.552 the name is constructed as - fthe bullet of the measurement definition. + 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). @@ -274,7 +274,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 - bullet e) of the measurement definition. + 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)."; -- GitLab From 2b4ee3e54c7ecc0b23c3825eae820d5fd68a8c14 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 24 Feb 2025 18:33:43 +0100 Subject: [PATCH 145/157] Locally rebased and commited https://forge.3gpp.org/rep/sa5/MnS/-/merge_requests/1576 --- yang-models/_3gpp-common-measurements.yang | 5 +++-- yang-models/_3gpp-common-yang-types.yang | 16 +++++++++++----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index 29d5ff7e7..e04577d77 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) @@ -57,6 +57,7 @@ module _3gpp-common-measurements { 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; } @@ -243,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; diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 3c8b9c7a4..a86c170a9 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -12,10 +12,11 @@ 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-20 { reference CR-0511; } revision 2024-05-18 { reference CR-0359; } revision 2024-04-12 { reference CR-0346; } revision 2023-11-06 { reference CR-0305; } @@ -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. -- GitLab From eea23a4359151b7c9ade4580cf378d6b0d1d3a5f Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 26 Feb 2025 13:23:54 +0100 Subject: [PATCH 146/157] Locally rebased and commited https://forge.3gpp.org/rep/sa5/MnS/-/merge_requests/1577 --- yang-models/_3gpp-common-trace.yang | 819 ++++++++++++++++------------ 1 file changed, 475 insertions(+), 344 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 0a1201721..3c2353ad4 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,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; + revision 2025-02-06 { reference "CR-0503" ; } revision 2025-02-05 { reference "CR-0460" ; } revision 2024-11-05 { reference "CR-0470" ; } revision 2024-10-06 { reference "CR-0459"; } @@ -144,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; @@ -254,7 +256,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 { @@ -577,12 +579,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 { @@ -597,71 +597,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; + } + } } } @@ -676,14 +782,24 @@ 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, + -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), @@ -725,7 +841,8 @@ 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. @@ -739,9 +856,16 @@ module _3gpp-common-trace { 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."; + 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"'; @@ -761,10 +885,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 { @@ -778,13 +902,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 { @@ -800,9 +923,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 { @@ -819,9 +941,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 { @@ -830,9 +951,8 @@ 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 { @@ -844,9 +964,8 @@ 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 { @@ -870,9 +989,8 @@ 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 { @@ -883,40 +1001,47 @@ 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 { 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 { @@ -928,9 +1053,8 @@ 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 { @@ -941,9 +1065,8 @@ 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 { @@ -954,40 +1077,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 { 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 { 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 { @@ -1000,7 +1119,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 { @@ -1010,7 +1129,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 { @@ -1022,7 +1141,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 { @@ -1048,10 +1167,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 { @@ -1066,13 +1183,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 { @@ -1087,13 +1202,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 { @@ -1108,13 +1221,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 { @@ -1129,13 +1240,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 { @@ -1150,13 +1259,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 { @@ -1171,13 +1278,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 { @@ -1192,13 +1297,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 { @@ -1213,13 +1316,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 { @@ -1234,48 +1335,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 { @@ -1287,24 +1397,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 { @@ -1314,7 +1430,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 { @@ -1329,7 +1445,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 { @@ -1342,9 +1458,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 { @@ -1357,9 +1472,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 { @@ -1373,9 +1487,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 { @@ -1385,10 +1498,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 ; } @@ -1398,7 +1511,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; } @@ -1410,7 +1523,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; } @@ -1447,15 +1560,15 @@ module _3gpp-common-trace { 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."; - min-elements 0; max-elements 1; uses AreaScopeGrp; } @@ -1467,17 +1580,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; } @@ -1486,9 +1595,7 @@ 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; } @@ -1507,24 +1614,35 @@ module _3gpp-common-trace { grouping UECoreMeasConfigGrp { description "Represents the UECoreMeasConfig dataType. - This <> defines the aconfiguration parameters of IOC TraceJob - which are specific for 5GC UE level measurements collection."; + This <> defines the aconfiguration parameters of IOC + TraceJob which are specific for 5GC UE level measurements + collection."; leaf-list ueCoreMeasurements { type string; 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. + 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 non-3GPP specified 5GC UE level measurements the name is defined - elsewhere."; + 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 5GC UE + description "Granularity period used to produce 5GC UE level measurements. The period is defined in milliseconds (ms)."; } @@ -1541,12 +1659,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."; } } @@ -1567,22 +1689,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; } @@ -1591,8 +1708,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 { @@ -1600,9 +1723,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 { @@ -1610,7 +1732,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 { @@ -1622,7 +1744,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 ; @@ -1637,10 +1759,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"; @@ -1657,8 +1779,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; @@ -1674,13 +1796,20 @@ module _3gpp-common-trace { attribute is applicable for both Trace and MDT. This attribute includes the ID type of the target as an enumeration and the ID value. - The traceTarget shall be public ID in case of a Management Based - Activation is done to an ScscfFunction. The traceTarget shall be - cell only in case of the UTRAN cell traffic trace function. + The traceTarget shall be 'PUBLIC_ID' in case of a Management Based + Activation is done to an SCSCFFunction (Serving Call Session + Control Function) or PCSCFFunction (Proxy Call Session Control + Function). The traceTarget shall be 'UTRAN_CELL' only in case + of the UTRAN cell traffic trace function. + + The traceTarget shall be 'E-UTRAN_CELL' only in case of E-UTRAN cell + traffic trace function. - The traceTarget shall be E-UtranCell only in case of E-UTRAN cell - traffic trace function.The traceTarget shall be either IMSI or - IMEI(SV) if the Trace Session is activated to any of the following + The traceTarget shall be 'NG-RAN_CELL' only in case of NR cell + traffic trace function. + + The traceTarget shall be either 'IMSI', 'IMEI' or + 'IMEISV' if the Trace Session is activated to any of the following ManagedEntity(ies): - HssFunction - MscServerFunction @@ -1689,29 +1818,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 areaScope attribute - shall be able to carry a list of (cell or E-UtranCell or NRCellDU or - TA/LA/RA). - - In case of management based Immediate MDT, the traceTarget attribute - shall be null value, the areaScope attribute shall carry a list of - (Utrancell or E-UtranCell or NRCellDU). - - In case of management based Logged MDT, the traceTarget attribute - shall carry an eBs or a RNC or gNBs. The Logged MDT should be initiated - on the specified eNB or RNC or gNB in traceTarget. The areaScope - attribute shall carry a list of (Utrancell or E-UtranCell or NRCellDU or - TA/LA/RA). - - In case of RLF reporting, or RCEF reporting, the traceTarget - attribute shall be null value, the areaScope 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 { @@ -1770,7 +1901,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 -- GitLab From 97877048812d5cd8970992f795ab44f96dac4af6 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 26 Feb 2025 13:55:24 +0100 Subject: [PATCH 147/157] Locally rebased and commited https://forge.3gpp.org/rep/sa5/MnS/-/merge_requests/1548 --- yang-models/_3gpp-common-trace.yang | 25 ++++++++++++------- yang-models/_3gpp-common-yang-extensions.yang | 21 +++++++++++----- yang-models/_3gpp-common-yang-types.yang | 14 +++++------ 3 files changed, 38 insertions(+), 22 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 3c2353ad4..b19385705 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -25,7 +25,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; - revision 2025-02-06 { reference "CR-0503" ; } + 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"; } @@ -166,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."; + } } } diff --git a/yang-models/_3gpp-common-yang-extensions.yang b/yang-models/_3gpp-common-yang-extensions.yang index dc9c8e5b5..22d1090a8 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 a86c170a9..e8bd963e1 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -16,7 +16,8 @@ module _3gpp-common-yang-types { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623"; - revision 2025-02-20 { reference CR-0511; } + 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; } @@ -313,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; @@ -324,11 +325,6 @@ module _3gpp-common-yang-types { type Longitude; mandatory true; } - - leaf altitude { - type Altitude; - } - } typedef OnOff { @@ -645,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 { -- GitLab From 7af8ed5fae427bbeb3f9e9f32af391bcfdcaf35d Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 21 Feb 2025 11:25:28 +0000 Subject: [PATCH 148/157] Rel18 CR1456 TS28.541 correction to inconsistency between stage 2 and stage 3 --- OpenAPI/TS28541_NrNrm.yaml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 751378165..2e62cec8b 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -246,10 +246,8 @@ components: CyclicPrefix: type: string enum: - - '15' - - '30' - - '60' - - '120' + - NORMAL, + - EXTENDED TxDirection: type: string enum: @@ -267,8 +265,6 @@ components: enum: - INITIAL - OTHER - - SUL - IsESCoveredBy: type: string enum: @@ -925,7 +921,7 @@ components: $ref: '#/components/schemas/GGnbIdList' x2HOBlockList: $ref: '#/components/schemas/GEnbIdList' - xnHOBlackList: + xnHOBlockList: $ref: '#/components/schemas/GGnbIdList' mappingSetIDBackhaulAddress: type: array -- GitLab From 1643097a1b8181a7bb5632e8103e916c2a062ad1 Mon Sep 17 00:00:00 2001 From: allwang Date: Tue, 4 Feb 2025 14:10:56 +0000 Subject: [PATCH 149/157] Update TS28623_ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 8c62eb9d1..0c2eac63a 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -106,17 +106,15 @@ components: $ref: '#/components/schemas/Longitude' altitude: $ref: '#/components/schemas/Float' - GeoPolygon: - type: array - items: - $ref: '#/components/schemas/GeoCoordinate' - minItems: 1 GeoArea: oneOf: - type: object properties: geoPolygon: - $ref: '#/components/schemas/GeoCoordinate' + type: array + items: + $ref: '#/components/schemas/GeoCoordinate' + minItems: 1 GeoAreaToCellMapping: type: object properties: -- GitLab From 2d15ae90e6bf32c0c23225a4f1898f0b08477b8b Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 21 Jan 2025 11:19:16 +0000 Subject: [PATCH 150/157] Update file TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 2e62cec8b..508389c8a 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -735,7 +735,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: @@ -763,6 +764,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 -------------------------------------------- -- GitLab From 14b3214df9fee38dc0c48781278bc9ac4552ed03 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 22 Jan 2025 00:52:11 +0000 Subject: [PATCH 151/157] Update 2 files - /OpenAPI/TS28104_MdaNrm.yaml - /OpenAPI/TS28104_MdaReport.yaml --- OpenAPI/TS28104_MdaNrm.yaml | 2 +- OpenAPI/TS28104_MdaReport.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index 2f0530b4b..989a34c39 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -60,7 +60,7 @@ components: type: object properties: mDAType: - type: string + $ref: '#/components/schemas/MDAType' mDAOutputIEFilters: type: array items: diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index f3b97098d..9848d9c61 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -19,7 +19,7 @@ components: type: object properties: mDAType: - type: string + $ref: 'TS28104_MdaNrm.yaml#/components/schemas/MDAType' mDAOutputList: type: array items: -- GitLab From 9e4f8e0472ede425af62e161a1bac8c00b3b918d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Thu, 19 Dec 2024 10:13:35 +0000 Subject: [PATCH 152/157] Update TS28105_AiMlNrm.yaml --- OpenAPI/TS28105_AiMlNrm.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index e85c31cb2..888d989d6 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -249,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: -- GitLab From 730406ca6abd074685c1fb5f87c15419fcdfc0f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Fri, 7 Feb 2025 11:58:08 +0000 Subject: [PATCH 153/157] Update TS28105_AiMlNrm.yaml --- OpenAPI/TS28105_AiMlNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 888d989d6..349f79cf7 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -4,7 +4,7 @@ info: version: 18.6.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 -- GitLab From aa8d9bd38084de9decfb5d1dd3d1a387715fd3d4 Mon Sep 17 00:00:00 2001 From: ruanb Date: Fri, 7 Feb 2025 09:45:39 +0000 Subject: [PATCH 154/157] Rel18_CR1465_TS28.541_add_missing_satelliteCoverageInfoList_for_stage3_OpenAPI --- OpenAPI/TS28541_5GcNrm.yaml | 46 +++++++++++++++++++++++++++++++++---- 1 file changed, 41 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 82448ccc6..5ddc6613b 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -147,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) @@ -2342,9 +2340,47 @@ components: blockedLocation: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' blockedDurWindow: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' blockedSlice: $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: + 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 @@ -3037,8 +3073,6 @@ components: $ref: '#/components/schemas/AmfIdentifier' sBIFqdn: type: string - weightFactor: - $ref: '#/components/schemas/WeightFactor' cNSIIdList: $ref: '#/components/schemas/CNSIIdList' amfSetRef: @@ -3049,6 +3083,8 @@ components: $ref: '#/components/schemas/CommModelList' nTNPLMNRestrictionsList: $ref: '#/components/schemas/NTNPLMNRestrictionsList' + satelliteCoverageInfoList: + $ref: '#/components/schemas/SatelliteCoverageInfoList' amfInfo: $ref: '#/components/schemas/AmfInfo' sliceExpiryInfo: -- GitLab From 07b98d730137e26053b8f9e54c8a9e883731bf8f Mon Sep 17 00:00:00 2001 From: shixixi Date: Sun, 26 Jan 2025 07:26:10 +0000 Subject: [PATCH 155/157] Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 508389c8a..0ff5e36f5 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -167,19 +167,11 @@ components: type: integer minimum: 0 maximum: 100 - maxNumberOfPreamblesSent: - enum: - - n3 - - n4 - - n5 - - n6 - - n7 - - n8 - - n10 - - n20 - - n50 - - n100 - - n200 + NumberOfPreamblesSent: + type: integer + minimum: 0 + maximum: 200 + UeAccDelayProbabilityDist: type: array -- GitLab From 1b2b2913e4291982d2cf9e57c539bfb042fe3bcf Mon Sep 17 00:00:00 2001 From: shixixi Date: Wed, 5 Feb 2025 07:25:14 +0000 Subject: [PATCH 156/157] Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 0ff5e36f5..1ba1e322d 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -167,7 +167,7 @@ components: type: integer minimum: 0 maximum: 100 - NumberOfPreamblesSent: + numberOfPreamblesSent: type: integer minimum: 0 maximum: 200 -- GitLab From d0f77e3f85cfe0214e9c0aed8a47cd2ddc1e21da Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 28 Feb 2025 09:38:15 +0000 Subject: [PATCH 157/157] Code Moderator update copyright and version --- OpenAPI/TS28104_MdaNrm.yaml | 4 ++-- OpenAPI/TS28104_MdaReport.yaml | 4 ++-- OpenAPI/TS28105_AiMlNrm.yaml | 2 +- OpenAPI/TS28541_5GcNrm.yaml | 4 ++-- OpenAPI/TS28541_NrNrm.yaml | 4 ++-- OpenAPI/TS28623_ComDefs.yaml | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index 989a34c39..3071fa954 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.6.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 diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index 9848d9c61..ae1b0c0ad 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.6.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 diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 349f79cf7..5e24d9000 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: AI/ML NRM - version: 18.6.0 + version: 18.7.0 description: >- OAS 3.0.1 specification of the AI/ML NRM © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 5ddc6613b..c231b37d5 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.10.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 diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 1ba1e322d..f724f144b 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.10.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 diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 0c2eac63a..6a51002c7 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.9.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 -- GitLab