From ac09ff59a17d916ab776ac394084306c226c25f2 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 21 Aug 2024 14:57:34 +0200 Subject: [PATCH 1/3] Updates to follow stage2 --- yang-models/_3gpp-common-trace.yang | 81 ++++++++++++------- yang-models/_3gpp-common-util.yang | 3 +- yang-models/_3gpp-common-yang-types.yang | 25 +++++- .../_3gpp-nr-nrm-danrmanagementfunction.yang | 36 +++++---- 4 files changed, 95 insertions(+), 50 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 0953de0b6..c15b69798 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-13 { reference CR-0387; } revision 2024-05-12 { reference "CR-0401"; } revision 2024-05-06 { reference CR-0359; } revision 2024-04-06 { reference "CR-0342"; } @@ -690,15 +691,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). @@ -736,8 +737,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. @@ -745,10 +746,10 @@ module _3gpp-common-trace { - For measurements M4, M5, M6 and M7 in NR, for measurements 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 + 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."; @@ -844,7 +845,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 { @@ -858,7 +859,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 { @@ -884,7 +885,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 { @@ -897,7 +898,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 { @@ -928,7 +929,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 { @@ -942,7 +943,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 { @@ -955,7 +956,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 { @@ -968,7 +969,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 { @@ -983,7 +984,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 { @@ -1521,18 +1522,36 @@ 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."; - leaf-list ueMeasurements { + leaf-list ueCoreMeasurements { type string; - description "It specifies the List of UE level measurements."; - } + min-elements 1; + description "List of 5GC UE level measurements identified by name. - leaf ueMeasGranularityPeriod { + The list may include 5GC UE level measurements defined in TS 28.558, + or vendor specific measurements. + + For 5GC UE level measurements defined in TS 28.558, the name is + constructed as follows: + - 'family.measurementName.subcounter' for measurement type with + specified subcounter + - 'family.measurementName.ALL' for measurement type with all supported + subcounters + - 'family.measurementName' for measurement type without subcounters + - 'family' for measurement family, including all measurement types and + the associated subcounters under this family. + For non-3GPP specified 5GC UE level measurements the name is defined + elsewhere."; + } + + leaf ueCoreMeasGranularityPeriod { type uint32; + mandatory true; + units milliseconds; description "It specifies the Granularity period used to produce UE level measurements. The period is defined in milliseconds (ms)."; } @@ -1753,7 +1772,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"' @@ -1762,7 +1781,7 @@ module _3gpp-common-trace { key idx; description "5GC UE level measurements config"; max-elements 1; - uses UEMeasConfigGrp; + uses UECoreMeasConfigGrp; leaf idx { type string; } } @@ -1840,10 +1859,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 diff --git a/yang-models/_3gpp-common-util.yang b/yang-models/_3gpp-common-util.yang index 6e58aa14f..078e9a439 100644 --- a/yang-models/_3gpp-common-util.yang +++ b/yang-models/_3gpp-common-util.yang @@ -16,6 +16,7 @@ module _3gpp-common-util { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623"; + revision 2024-08-13 { reference CR-0387; } revision 2024-05-06 { reference CR-0359; } feature SchedulerUnderManagedElement { @@ -88,7 +89,7 @@ module _3gpp-common-util { must 'not(../daysOfWeek)'; description "Shall be present in case of Monthly periodicity, otherwise not"; - type types3gpp:DaysOfMonth; + type types3gpp:DateMonthDay; } } } diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 3c8b9c7a4..25d9a5b5b 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -16,6 +16,7 @@ module _3gpp-common-yang-types { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623"; + revision 2024-08-13 { reference CR-0387; } revision 2024-05-18 { reference CR-0359; } revision 2024-04-12 { reference CR-0346; } revision 2023-11-06 { reference CR-0305; } @@ -94,7 +95,13 @@ module _3gpp-common-yang-types { } } - typedef DaysOfMonth { + typedef DateMonth { + type uint8 { + range 0..12; + } + } + + typedef DateMonthDay { type uint8 { range 0..31; } @@ -103,6 +110,22 @@ module _3gpp-common-yang-types { typedef FullTime { type yang:time-with-zone-offset; } + + grouping DayInYearGrp { + description "This <> represents a day in a year."; + + leaf month { + description "It indicates the month in a year."; + type DateMonth; + mandatory true; + } + + leaf monthDay { + description "It indicates the day in a month."; + type DateMonthDay; + mandatory true; + } + } grouping TimeWindowGrp { leaf startTime { diff --git a/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang index d0afa896a..3260d3646 100755 --- a/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang +++ b/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang @@ -3,45 +3,47 @@ module _3gpp-nr-nrm-danrmanagementfunction { namespace "urn:3gpp:sa5:_3gpp-nr-nrm-danrmanagementfunction"; prefix "danrmanagementfunction3gpp"; - import _3gpp-common-top { prefix top3gpp; } import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } - - organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Defines the YANG mapping of the DANRManagementFunction Information Object Class - (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + description "Defines the YANG mapping of the DANRManagementFunction IOC + that is part of the NR Network Resource Model (NRM). + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-08-19 { reference CR-1314 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2020-05-08 { reference S5-203316; } - grouping DANRManagementFunctionGrp { description "Represents the DANRManagementFunction IOC."; - reference "3GPP TS 28.541"; - uses top3gpp:Top_Grp; leaf intrasystemANRManagementSwitch { - description "This attribute determines whether the intra-system ANR function is activated or deactivated."; - type boolean; + description "This attribute determines whether the intra-system ANR + function is activated or deactivated."; + type boolean; } leaf intersystemANRManagementSwitch { - description "This attribute determines whether the inter-system ANR function is activated or deactivated."; - type boolean; + description "This attribute determines whether the inter-system ANR + function is activated or deactivated."; + type boolean; } - - } augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction" { - if-feature gnbcucp3gpp:DANRManagementFunction; - uses DANRManagementFunctionGrp; + list DANRManagementFunction { + description "This IOC contains attributes to support the D-SON function + of ANR Management (See clause 6.4.1.3 in TS 28.313 ."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses DANRManagementFunctionGrp; + } + } } } \ No newline at end of file -- GitLab From 37fb52defaf8d40996e7e181bff58b85603be383 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 21 Aug 2024 16:15:48 +0200 Subject: [PATCH 2/3] yang stage2-3 ubdated B --- yang-models/_3gpp-common-trace.yang | 8 ++++---- yang-models/_3gpp-nr-nrm-bwpset.yang | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index c15b69798..d8426ac39 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -1537,12 +1537,12 @@ module _3gpp-common-trace { For 5GC UE level measurements defined in TS 28.558, the name is constructed as follows: - - 'family.measurementName.subcounter' for measurement type with + - 'family.measurementName.subcounter' for measurement type with specified subcounter - - 'family.measurementName.ALL' for measurement type with all supported + - '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 + - '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."; diff --git a/yang-models/_3gpp-nr-nrm-bwpset.yang b/yang-models/_3gpp-nr-nrm-bwpset.yang index 8b92fa083..cba0ca407 100644 --- a/yang-models/_3gpp-nr-nrm-bwpset.yang +++ b/yang-models/_3gpp-nr-nrm-bwpset.yang @@ -12,10 +12,11 @@ module _3gpp-nr-nrm-bwpset { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the BWPSet Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-08-19 { reference CR-1314 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-06-29 { reference CR-0756 ; } @@ -26,7 +27,7 @@ module _3gpp-nr-nrm-bwpset { } augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" { - list BWPList { + list BWPLSett { description "Represents a bandwidth part (BWP) set."; key id; uses top3gpp:Top_Grp; -- GitLab From 89b481f4ad9c4ba81502c12d212d52dc711fc4f9 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 21 Aug 2024 17:08:33 +0200 Subject: [PATCH 3/3] renamed EP_NLG into EP_NL2 following stage 2 --- yang-models/_3gpp-5gc-nrm-ep.yang | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-ep.yang b/yang-models/_3gpp-5gc-nrm-ep.yang index 803d3b134..73854e5d4 100755 --- a/yang-models/_3gpp-5gc-nrm-ep.yang +++ b/yang-models/_3gpp-5gc-nrm-ep.yang @@ -28,10 +28,11 @@ module _3gpp-5gc-nrm-ep { description "Defines the YANG mapping of the 5GC related endpoint Information Object Classes (IOCs) that are part of the 5G Core Network Resource Model. - 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-19 { reference CR-1314 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-11-18 { description "Ericsson refactoring."; @@ -179,7 +180,7 @@ module _3gpp-5gc-nrm-ep { uses eprp3gpp:EP_Common; } - grouping EP_NLGGrp { + grouping EP_NL2Grp { uses eprp3gpp:EP_Common; } @@ -312,12 +313,12 @@ module _3gpp-5gc-nrm-ep { } } - list EP_NLG { - description "Represents the EP_NLG IOC."; + list EP_NL2 { + description "Represents the EP_NL2 IOC."; key id; uses top3gpp:Top_Grp; container attributes { - uses EP_NLGGrp; + uses EP_NL2Grp; } } } -- GitLab