From bc7e7446279fd6ffcb55f3950069fc16b203600d Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 05:00:57 +0000 Subject: [PATCH 01/41] Update _3gpp-5gc-nrm-nwdaffunction.yang Correct description of attribute networkSliceInfoList in NWDAFFunctionGrp --- yang-models/_3gpp-5gc-nrm-nwdaffunction.yang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang index 5fe7eb7ae..b713afc3b 100755 --- a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang @@ -319,8 +319,8 @@ module _3gpp-5gc-nrm-nwdaffunction { key idx; min-elements 1; description "The attribute specifies a list of NetworkSliceInfo which - is defined as a datatype (see clause 5.3.95). It can be used by the - NWDAF to facilitate the data collection from OAM."; + is defined as a datatype (see clause 5.3.95). It is used by an authorized consumer, e.g. + NWDAF, to facilitate the data collection from OAM."; leaf idx { type string; } @@ -393,4 +393,4 @@ module _3gpp-5gc-nrm-nwdaffunction { uses mf3gpp:ManagedFunctionContainedClasses; } } -} \ No newline at end of file +} -- GitLab From 86e2fc9188d486bfa45bdf9b3dde41be9f9e3ffb Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 08:16:57 +0000 Subject: [PATCH 02/41] Update _3gpp-5gc-nrm-nwdaffunction.yang correct description of networkSliceInfoList for NWDAFFunctionGrp --- yang-models/_3gpp-5gc-nrm-nwdaffunction.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang index b713afc3b..c417b91ad 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-07 { reference CR-1329; } revision 2024-04-12 { reference CR-1218; } revision 2023-09-18 { reference CR-1043; } revision 2023-04-26 { reference CR-0916; } -- GitLab From 8e727dfe4a6406fc8f05e3f61074d9546d43e20e Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 08:56:20 +0000 Subject: [PATCH 03/41] Update _3gpp-5gc-nrm-nwdaffunction.yang correct line 323 size --- yang-models/_3gpp-5gc-nrm-nwdaffunction.yang | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang index c417b91ad..d5a6cdb4e 100755 --- a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang @@ -320,8 +320,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 is used by an authorized consumer, e.g. - 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 0cda52d54786db3c53ff00066bddc3853b3ab476 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 16:41:25 +0000 Subject: [PATCH 04/41] Update _3gpp-5gc-nrm-nwdaffunction.yang --- yang-models/_3gpp-5gc-nrm-nwdaffunction.yang | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang index d5a6cdb4e..33033562c 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)and the following attributes:"; uses mf3gpp:ManagedFunctionGrp; list pLMNInfoList { @@ -323,7 +324,7 @@ module _3gpp-5gc-nrm-nwdaffunction { 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 { + leaf idx { type string; } uses NetworkSliceInfoGrp; -- GitLab From 1253c988374916a9bd7d5c2c080a133ec041514e Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 22 Jul 2024 15:31:39 +0200 Subject: [PATCH 05/41] Add MeContect IOC --- yang-models/_3gpp-common-mecontext.yang | 83 +++++++++++++++++++++++++ 1 file changed, 83 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..37a5e6d44 --- /dev/null +++ b/yang-models/_3gpp-common-mecontext.yang @@ -0,0 +1,83 @@ +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-15 { reference CR-xxxx; } + + grouping MeContextGrp { + description "Represents the MeContext IOC."; + + leaf dnPrefix { + type types3gpp:DistinguishedName; + config false; + 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 783696d2e2760f0e804919a2adb68e935dabdf65 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 7 Aug 2024 11:05:41 +0200 Subject: [PATCH 06/41] Added CR numbers; the file is common for r17,18,19 --- yang-models/_3gpp-common-mecontext.yang | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-mecontext.yang b/yang-models/_3gpp-common-mecontext.yang index 37a5e6d44..ed183f1a7 100644 --- a/yang-models/_3gpp-common-mecontext.yang +++ b/yang-models/_3gpp-common-mecontext.yang @@ -24,14 +24,13 @@ module _3gpp-common-mecontext { Integration Reference Point (IRP); Information Service (IS)"; - revision 2024-07-15 { reference CR-xxxx; } + revision 2024-07-17 { reference "CR-0381 CR-0382 CR-0383"; } grouping MeContextGrp { description "Represents the MeContext IOC."; leaf dnPrefix { type types3gpp:DistinguishedName; - config false; 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."; -- GitLab From 3ba14deae74d39ef36f7fc98f70527900e1a3e68 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 21 Aug 2024 14:57:34 +0200 Subject: [PATCH 07/41] 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 55d3017a55a7aeddc668b9b3583e31a7e6bca142 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 21 Aug 2024 16:15:48 +0200 Subject: [PATCH 08/41] 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 75fd3032e18344c33acf902ea07557995ac7064c Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 21 Aug 2024 17:08:33 +0200 Subject: [PATCH 09/41] 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 From 742c34e40ac5d90188b5fa7dd03d1f197811c00b Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 16 Sep 2024 16:29:53 +0200 Subject: [PATCH 10/41] Local rebase and commit of MR1296 28.623_Rel19_Update_ConditionMonitor_for_YANG into Integration_Rel19_SA5_156_YANG_CR0393 --- yang-models/_3gpp-common-util.yang | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/yang-models/_3gpp-common-util.yang b/yang-models/_3gpp-common-util.yang index 078e9a439..040b1f501 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,7 +17,8 @@ module _3gpp-common-util { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623"; - revision 2024-08-13 { reference CR-0387; } + revision 2024-08-13 { reference CR-0387; } + revision 2024-07-30 { reference "CR-0392 CR-0393"; } revision 2024-05-06 { reference CR-0359; } feature SchedulerUnderManagedElement { @@ -158,14 +160,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."; } @@ -174,7 +184,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 0a61ee9bd4200fb8b35b18e27193c5b9f4633ae0 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 16 Sep 2024 16:48:45 +0200 Subject: [PATCH 11/41] Local rebase and commit of MR1324 28.623 Rel-19 CR0405 Trace new RRC reports CR0405 --- yang-models/_3gpp-common-trace.yang | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index d8426ac39..3fb24618c 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -26,6 +26,7 @@ module _3gpp-common-trace { Information Service (IS)" ; revision 2024-08-13 { reference CR-0387; } + revision 2024-08-07 { reference "CR-0405"; } revision 2024-05-12 { reference "CR-0401"; } revision 2024-05-06 { reference CR-0359; } revision 2024-04-06 { reference "CR-0342"; } @@ -1593,18 +1594,34 @@ module _3gpp-common-trace { enum TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS; enum IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS; enum TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS; + enum RRC_REPORT; } 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 + of Trace, immediate MDT and 5GC UE level measurement collection or RRC + reporting. + The attribute is applicable for Trace, MDT, RCEF, RRC 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."; } - + leaf-list rrcReportType { + type enumeration { + enum RLF_REPORT; + enum RCEF_REPORT; + enum SHR; + enum SPR; + enum MHI; + enum RA_REPORT; + enum UHI_REPORT; + } + description "Specifies the RRC reports requested. "; + reference "Clause 5.X of 3GPP TS 32.422 for additional details on the + allowed values."; + } + list pLMNTarget { key "mcc mnc"; description "Specifies which PLMN that the subscriber of the session to -- GitLab From ae0c54cf0b8130ab65027780de728e32b6b8687b Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 16 Sep 2024 17:02:58 +0200 Subject: [PATCH 12/41] Local rebase and commit of MR1281 Rel19_CR0421_TS_28.623_Correction_to_AreaScope_stage3_YANG --- 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 3fb24618c..8b418365e 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -26,7 +26,7 @@ module _3gpp-common-trace { Information Service (IS)" ; revision 2024-08-13 { reference CR-0387; } - revision 2024-08-07 { reference "CR-0405"; } + revision 2024-08-07 { reference "CR-0405 CR-0421"; } revision 2024-05-12 { reference "CR-0401"; } revision 2024-05-06 { reference CR-0359; } revision 2024-04-06 { reference "CR-0342"; } @@ -107,20 +107,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 { @@ -130,11 +119,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 e65f022a1c661f2769e9cf4f65408b6b37aec33f Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 16 Sep 2024 17:18:19 +0200 Subject: [PATCH 13/41] Local rebase and commit of MR1226 Rel19 cr0379 28.623 correction on mdt configuration in mrdc CR0379 --- 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 8b418365e..282b9ab13 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -26,7 +26,7 @@ module _3gpp-common-trace { Information Service (IS)" ; revision 2024-08-13 { reference CR-0387; } - revision 2024-08-07 { reference "CR-0405 CR-0421"; } + revision 2024-08-07 { reference "CR-0405 CR-0421 CR-0379"; } revision 2024-05-12 { reference "CR-0401"; } revision 2024-05-06 { reference CR-0359; } revision 2024-04-06 { reference "CR-0342"; } @@ -1510,6 +1510,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 49edb8418ffcb0080ebe9c6f2470e185f184af9c Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 16 Sep 2024 18:04:43 +0200 Subject: [PATCH 14/41] Local rebase and commit of MR1214 Rel_19 TS28.623 CR 0377 Rename attributes for 5GC UE level measurement --- yang-models/_3gpp-common-trace.yang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 282b9ab13..30a4db45b 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-13 { reference CR-0387; } + revision 2024-08-13 { reference "CR-0387 CR-0377"; } revision 2024-08-07 { reference "CR-0405 CR-0421 CR-0379"; } revision 2024-05-12 { reference "CR-0401"; } revision 2024-05-06 { reference CR-0359; } @@ -1522,7 +1522,7 @@ module _3gpp-common-trace { } grouping UECoreMeasConfigGrp { - description "Represents the ueCoreMeasConfig dataType. + description "Represents the UECoreMeasConfig dataType. This <> defines the aconfiguration parameters of IOC TraceJob which are specific for UE level measurements collection."; @@ -1551,7 +1551,7 @@ module _3gpp-common-trace { type uint32; mandatory true; units milliseconds; - description "It specifies the Granularity period used to produce UE level + description "It specifies the Granularity period used to produce 5GC UE level measurements. The period is defined in milliseconds (ms)."; } -- GitLab From 724d5edb82bec2eb893822e6d9f7d992e350b764 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 Aug 2024 07:24:08 +0000 Subject: [PATCH 15/41] Add new file --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 54 +++++++++++++++++++++ 1 file changed, 54 insertions(+) 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..15cca562b --- /dev/null +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -0,0 +1,54 @@ +module _3gpp-nr-nrm-ecmappingrule { + yang-version 1.1; + namespace urn:3gpp:sa5:_3gpp-nr-nrm-ecmappingrule; + prefix ecmap3gpp; + + import _3gpp-common-top { prefix top3gpp; } + + organization "3gpp SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "This IOC represents the unified mapping rule input to support + Energy Cost Index Mapping when Energy Cost Reporting. + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.541"; + + revision 2024-08-21 { reference CR-1337 ; } + + 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."; + } + + leaf eCMRInputMaxValue { + type uint8; + description "The maximum value of to be applied + for mapping from this attribute to the energy cost."; + } + + leaf eCTimeInterval { + type uint8; + description "Time interval (in seconds) that + should be applied for collecting values of mapping + rule attribute to be used for computing the energy cost."; + units seconds; + } + } + + grouping NGRANECMappingRuleSubtree { + description "Helps augmenting NGRANECMappingRule into multiple places."; + list NGRANECMappingRule { + key id; + uses top3gpp:Top_Grp; + min-elements 1; + max-elements 1; + leaf idx { type uint32; } + container attributes { + uses NGRANECMappingRuleGrp; + } + } + } +} -- GitLab From b06cc65e6b4fd2aa81f2c9b4fc371c1ec00a444c Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 Aug 2024 07:26:47 +0000 Subject: [PATCH 16/41] Update _3gpp-common-subnetwork.yang --- yang-models/_3gpp-common-subnetwork.yang | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang index d6d5f7010..d3e1bea68 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-01-30 { reference CR-1337 ; } 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"; @@ -264,6 +270,11 @@ module _3gpp-common-subnetwork { if-feature EcmConnectionInfoUnderSubNetwork; } + uses ecmap3gpp:NGRANECMappingRuleSubtree { + if-feature EcmConnectionInfoUnderSubNetwork; + } + + yangmnt:mount-point children-of-SubNetwork { description "Mountpoint for ManagedElement"; reference "RFC8528 YANG Schema Mount"; @@ -271,4 +282,4 @@ module _3gpp-common-subnetwork { // augment external parts here } -} \ No newline at end of file +} -- GitLab From da5c85f5991f4568a73734167d832d93936ecb3a Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 Aug 2024 07:28:46 +0000 Subject: [PATCH 17/41] Update _3gpp-common-managed-element.yang --- yang-models/_3gpp-common-managed-element.yang | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index 233aa6f4a..ad54b08b5 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -12,6 +12,7 @@ module _3gpp-common-managed-element { import _3gpp-common-files { prefix files3gpp; } import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; } import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; } + import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -33,6 +34,7 @@ module _3gpp-common-managed-element { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2024-08-21 { reference CR-1337 ; } revision 2024-01-30 { reference CR-0328 ; } revision 2023-11-14 { reference CR-0305 ; } revision 2023-09-18 { reference CR-0271 ; } @@ -49,6 +51,10 @@ module _3gpp-common-managed-element { revision 2019-06-17 { reference " S5-203316"; } revision 2019-05-08 { reference "Initial revision"; } + feature ECMappingRuleUnderManagedElement { + description "ECMappingRule shall be contained under ManagedElement."; + } + feature EcmConnectionInfoUnderManagedElement { description "The EcmConnectionInfo shall be contained under ManagedElement"; @@ -304,5 +310,10 @@ module _3gpp-common-managed-element { uses econn3gpp:EcmConnectionInfoSubtree { if-feature EcmConnectionInfoUnderManagedElement; } + + uses ecmap3gpp:NGRANECMappingRuleSubtree { + if-feature EcmConnectionInfoUnderManagedElement; + } + } } -- GitLab From 8dcd4b3e783aa403a405ea0b9a77f43f0a9ff848 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 Aug 2024 07:31:07 +0000 Subject: [PATCH 18/41] Update _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 7d8eabeec..5fb2475ec 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-21 { reference CR-1337 ; } revision 2024-05-24 { reference CR-1273 ; } revision 2024-04-04 { reference CR-1139; } revision 2024-02-24 { reference CR-1218; } @@ -180,6 +181,13 @@ module _3gpp-nr-nrm-gnbcucpfunction { type types3gpp:DistinguishedName; description "This is the DN of EphemerisInfoSet."; } + + leaf nRECMappingRuleRef { + type types3gpp:DistinguishedName; + description "DN of a NRECMappingRule."; + } + + } grouping QceIdMappingInfoGrp { @@ -223,4 +231,4 @@ module _3gpp-nr-nrm-gnbcucpfunction { } } } -} \ No newline at end of file +} -- GitLab From ecfd096930f64384ec1571ed2bcf5c414667b1e1 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 Aug 2024 14:41:08 +0000 Subject: [PATCH 19/41] 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 15cca562b..71a6e89aa 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-21 { reference CR-1337 ; } - 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,16 +38,16 @@ 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 { key id; uses top3gpp:Top_Grp; min-elements 1; max-elements 1; leaf idx { type uint32; } container attributes { - uses NGRANECMappingRuleGrp; + uses NRECMappingRuleGrp; } } } -- GitLab From fbcc4274b91b3a4e977f94ffd0b4daea1f00c786 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 Aug 2024 14:41:29 +0000 Subject: [PATCH 20/41] 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 ad54b08b5..67e6a6e15 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -311,7 +311,7 @@ module _3gpp-common-managed-element { if-feature EcmConnectionInfoUnderManagedElement; } - uses ecmap3gpp:NGRANECMappingRuleSubtree { + uses ecmap3gpp:NRECMappingRuleSubtree { if-feature EcmConnectionInfoUnderManagedElement; } -- GitLab From aa305d17c6ed6f6dc130f32bde9cd828f3e659dd Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 Aug 2024 14:41:52 +0000 Subject: [PATCH 21/41] Update _3gpp-common-subnetwork.yang --- yang-models/_3gpp-common-subnetwork.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang index d3e1bea68..ddd472941 100755 --- a/yang-models/_3gpp-common-subnetwork.yang +++ b/yang-models/_3gpp-common-subnetwork.yang @@ -270,7 +270,7 @@ module _3gpp-common-subnetwork { if-feature EcmConnectionInfoUnderSubNetwork; } - uses ecmap3gpp:NGRANECMappingRuleSubtree { + uses ecmap3gpp:NRECMappingRuleSubtree { if-feature EcmConnectionInfoUnderSubNetwork; } -- GitLab From 62772f678b0f655628c3cfc4ba43a64ab7888bc1 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 23 Aug 2024 06:11:28 +0000 Subject: [PATCH 22/41] Revert "Update _3gpp-common-managed-element.yang" This reverts commit ba2aaf70017a3ca4ae2b1e824ebe641b5bdd4930 --- 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 67e6a6e15..ad54b08b5 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -311,7 +311,7 @@ module _3gpp-common-managed-element { if-feature EcmConnectionInfoUnderManagedElement; } - uses ecmap3gpp:NRECMappingRuleSubtree { + uses ecmap3gpp:NGRANECMappingRuleSubtree { if-feature EcmConnectionInfoUnderManagedElement; } -- GitLab From f48461ee882e312944131b93130c4bd6befab29b Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 23 Aug 2024 06:15:34 +0000 Subject: [PATCH 23/41] 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 ad54b08b5..81a6c1e80 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -312,7 +312,7 @@ module _3gpp-common-managed-element { } uses ecmap3gpp:NGRANECMappingRuleSubtree { - if-feature EcmConnectionInfoUnderManagedElement; + if-feature ECMappingRuleUnderManagedElement; } } -- GitLab From 35a705ffec36499b3d108f8e52c9cc5727446d86 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 23 Aug 2024 06:18:55 +0000 Subject: [PATCH 24/41] 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 81a6c1e80..705d01a29 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -311,7 +311,7 @@ module _3gpp-common-managed-element { if-feature EcmConnectionInfoUnderManagedElement; } - uses ecmap3gpp:NGRANECMappingRuleSubtree { + uses ecmap3gpp:NRECMappingRuleSubtree { if-feature ECMappingRuleUnderManagedElement; } -- GitLab From 5371581d5724f3303a82d0b55f58469958176b2b Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 23 Aug 2024 08:59:46 +0000 Subject: [PATCH 25/41] 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 71a6e89aa..ac5fbfe30 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-21 { reference CR-1337 ; } 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 41d612c470c6cad4e8ea27e5b9334412eaee08a2 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 23 Aug 2024 09:01:09 +0000 Subject: [PATCH 26/41] 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 5fb2475ec..ad0875a56 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 1eed2b8e3ff0da6ccf4815a96c2063ade554c89b Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 23 Aug 2024 10:01:02 +0000 Subject: [PATCH 27/41] Update _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index ad0875a56..896327a78 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -185,10 +185,9 @@ 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."; } - - } grouping QceIdMappingInfoGrp { -- GitLab From a7e99a639f0d27063f5e1d70be4fd08451be878b Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 16 Sep 2024 18:39:37 +0200 Subject: [PATCH 28/41] Local rebase and commit of MR1334 28.541_Rel19_CR1352_NRM_for_managing_PM_for_LTM --- 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 896327a78..839cb879c 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -19,7 +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-21 { reference CR-1337 ; } + revision 2024-08-19 { reference "CR-1337 CR-1352"; } revision 2024-05-24 { reference CR-1273 ; } revision 2024-04-04 { reference CR-1139; } revision 2024-02-24 { reference CR-1218; } @@ -142,6 +142,12 @@ module _3gpp-nr-nrm-gnbcucpfunction { enabled or disabled."; } + leaf dLTMCellSwitchControl { + type boolean; + description "This attribute determines whether the distributed SON + function LTM Cell Switch is enabled or disabled."; + } + leaf dDAPSHOControl { type boolean; description "This attribute determines whether the DAPS handover function -- GitLab From 47a619f6f554e45c4b48a75a0d845ec9889eb8f4 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 15:05:25 +0000 Subject: [PATCH 29/41] Update _3gpp-5gc-nrm-anlffunction.yang add support for mLModelRefList and aIMLInferenceFunctionRefList --- yang-models/_3gpp-5gc-nrm-anlffunction.yang | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/yang-models/_3gpp-5gc-nrm-anlffunction.yang b/yang-models/_3gpp-5gc-nrm-anlffunction.yang index 85673a4c7..672af83ff 100644 --- a/yang-models/_3gpp-5gc-nrm-anlffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-anlffunction.yang @@ -7,6 +7,7 @@ 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; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -16,6 +17,7 @@ module _3gpp-5gc-nrm-anlffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2024-08-07 { reference 1331; } revision 2023-11-03 { reference "initial revision"; } grouping AnLFFunctionGrp { @@ -29,6 +31,16 @@ 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 10f2a5e86731012ab3ef871dbcdeebab9811f12c Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 15:10:07 +0000 Subject: [PATCH 30/41] Update _3gpp-nr-nrm-desmanagementfunction.yang mLModelRefList and aIMLInferenceFunctionRefList support --- .../_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..c7f49bfc8 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-07 { reference CR-1331; } 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 7d884a28d460f8f784b3f61c77536456f3fff1c3 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 15:17:16 +0000 Subject: [PATCH 31/41] Update _3gpp-nr-nrm-dlbofunction.yang mLModelRefList and aIMLInferenceFunctionRefList support --- yang-models/_3gpp-nr-nrm-dlbofunction.yang | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-dlbofunction.yang b/yang-models/_3gpp-nr-nrm-dlbofunction.yang index 6ae29fa50..3844abac7 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-07 { reference CR-1331; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-03-25 { reference "CR-0683"; } revision 2021-10-22 { reference "CR-0577"; } @@ -68,7 +70,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 { @@ -84,7 +95,7 @@ module _3gpp-nr-nrm-dlbofunction { uses top3gpp:Top_Grp; container attributes { uses DLBOFunctionGrp; - } + } } } @@ -101,4 +112,4 @@ module _3gpp-nr-nrm-dlbofunction { if-feature DLBOUnderSubNetwork; uses DLBOFunctionSubtree; } -} \ No newline at end of file +} -- GitLab From 15a0acdfebb3a93d632835f24c67f464781f6ec6 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 15:23:14 +0000 Subject: [PATCH 32/41] Update _3gpp-nr-nrm-dmrofunction.yang mLModelRefList and aIMLInferenceFunctionRefList support --- 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..785a555a5 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-07 { reference CR-1331; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-01-07 { reference CR-0633; } revision 2021-08-05 { reference S5-214053/CR-0518; } @@ -64,6 +66,16 @@ module _3gpp-nr-nrm-dmrofunction { description "This attribute determines whether the MRO function is 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]) ."; } } @@ -101,4 +113,4 @@ module _3gpp-nr-nrm-dmrofunction { if-feature subnet3gpp:DMROFunction; uses DMROFunctionSubtree; } -} \ No newline at end of file +} -- GitLab From 74e62cb6c15179f46d35c5fb2002e20f299e235d Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 15:48:30 +0000 Subject: [PATCH 33/41] Update _3gpp-5gc-nrm-anlffunction.yang --- yang-models/_3gpp-5gc-nrm-anlffunction.yang | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-anlffunction.yang b/yang-models/_3gpp-5gc-nrm-anlffunction.yang index 672af83ff..c9ecda627 100644 --- a/yang-models/_3gpp-5gc-nrm-anlffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-anlffunction.yang @@ -17,7 +17,7 @@ module _3gpp-5gc-nrm-anlffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - revision 2024-08-07 { reference 1331; } + revision 2024-08-07 { reference CR 1331; } revision 2023-11-03 { reference "initial revision"; } grouping AnLFFunctionGrp { @@ -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 99abbe9902f2cb958835f588f365ddcf36f8158d Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 15:55:46 +0000 Subject: [PATCH 34/41] Update _3gpp-5gc-nrm-anlffunction.yang --- yang-models/_3gpp-5gc-nrm-anlffunction.yang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-anlffunction.yang b/yang-models/_3gpp-5gc-nrm-anlffunction.yang index c9ecda627..534141149 100644 --- a/yang-models/_3gpp-5gc-nrm-anlffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-anlffunction.yang @@ -17,7 +17,7 @@ module _3gpp-5gc-nrm-anlffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - revision 2024-08-07 { reference CR 1331; } + revision 2024-08-07 { reference CR-1331; } revision 2023-11-03 { reference "initial revision"; } grouping AnLFFunctionGrp { @@ -34,13 +34,13 @@ module _3gpp-5gc-nrm-anlffunction { leaf-list mLModelRefList { type types3gpp:DistinguishedName; description "This attribute holds a DN list of MLModel ¨ - (See TS 28.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) ."; + (See TS 28.105) ."; config false; } } -- GitLab From e7079c4f69806193f6edcb6e59bd02271b2f3ae9 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 16:00:01 +0000 Subject: [PATCH 35/41] Update _3gpp-nr-nrm-desmanagementfunction.yang --- yang-models/_3gpp-nr-nrm-desmanagementfunction.yang | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang index c7f49bfc8..98a623d0c 100755 --- a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang +++ b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang @@ -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 e0292c8875cafb3555d14d4fa489324b72d3d446 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 16:04:16 +0000 Subject: [PATCH 36/41] Update _3gpp-nr-nrm-dlbofunction.yang --- yang-models/_3gpp-nr-nrm-dlbofunction.yang | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-dlbofunction.yang b/yang-models/_3gpp-nr-nrm-dlbofunction.yang index 3844abac7..698a88c76 100644 --- a/yang-models/_3gpp-nr-nrm-dlbofunction.yang +++ b/yang-models/_3gpp-nr-nrm-dlbofunction.yang @@ -73,12 +73,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 db4445f234a4dab612ccdd466925e0a9f0a5fd66 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 16:08:35 +0000 Subject: [PATCH 37/41] Update _3gpp-nr-nrm-dmrofunction.yang --- yang-models/_3gpp-nr-nrm-dmrofunction.yang | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-dmrofunction.yang b/yang-models/_3gpp-nr-nrm-dmrofunction.yang index 785a555a5..2d485a937 100755 --- a/yang-models/_3gpp-nr-nrm-dmrofunction.yang +++ b/yang-models/_3gpp-nr-nrm-dmrofunction.yang @@ -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 fe129a677d5c8a774de16269187b505ff315de0c Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 16:15:10 +0000 Subject: [PATCH 38/41] Update _3gpp-5gc-nrm-anlffunction.yang correct copyright --- yang-models/_3gpp-5gc-nrm-anlffunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-anlffunction.yang b/yang-models/_3gpp-5gc-nrm-anlffunction.yang index 534141149..3bb52fcdd 100644 --- a/yang-models/_3gpp-5gc-nrm-anlffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-anlffunction.yang @@ -13,7 +13,7 @@ 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"; -- GitLab From b232d6a8847c2775cff0ee33067d136d2a9ab6c9 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 16:15:56 +0000 Subject: [PATCH 39/41] Update _3gpp-nr-nrm-desmanagementfunction.yang correct copyright --- yang-models/_3gpp-nr-nrm-desmanagementfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-desmanagementfunction.yang index 98a623d0c..2e1e5bbaa 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)"; -- GitLab From 7ba0bc20a2d4fa2fd57df14ba8773445453e4b10 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 16:16:23 +0000 Subject: [PATCH 40/41] Update _3gpp-nr-nrm-dlbofunction.yang correct copyright --- yang-models/_3gpp-nr-nrm-dlbofunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-dlbofunction.yang b/yang-models/_3gpp-nr-nrm-dlbofunction.yang index 698a88c76..9a3781a45 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)"; -- GitLab From daf5e54e55c6a3ddeed97fc3e148b925c0ddd17b Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 9 Aug 2024 16:16:51 +0000 Subject: [PATCH 41/41] Update _3gpp-nr-nrm-dmrofunction.yang correct copyright --- yang-models/_3gpp-nr-nrm-dmrofunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-dmrofunction.yang b/yang-models/_3gpp-nr-nrm-dmrofunction.yang index 2d485a937..9c1937e1d 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)"; -- GitLab