From 021cf1a2b5054d9d9fc1915427c16cce1f0d5d1e Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 17 Apr 2024 19:40:58 +0800 Subject: [PATCH] 28.623 cr0347 28.541 cr1219 --- yang-models/_3gpp-5gc-nrm-nwdaffunction.yang | 5 ++-- yang-models/_3gpp-common-fm.yang | 7 +++--- .../_3gpp-common-managed-function.yang | 5 ++-- yang-models/_3gpp-common-measurements.yang | 9 ++++---- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 23 ++++++++++--------- 5 files changed, 27 insertions(+), 22 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang index 4d677f6a1..cbc732d1f 100755 --- a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang @@ -16,10 +16,11 @@ module _3gpp-5gc-nrm-nwdaffunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the NWDAF function in 5GC. For more information about the NWDAF, see 3GPP TS 23.501. - Copyright 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-02-23 { reference CR-1219 ; } revision 2023-09-17 { reference CR-1042 ; } revision 2020-11-07 { reference CR-0412 ; } revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; } @@ -128,7 +129,7 @@ module _3gpp-5gc-nrm-nwdaffunction { augment "/me3gpp:ManagedElement" { list NWDAFFunction { description "5G Core NWDAF Function"; - reference "3GPP TS 28.541"; + reference "3GPP TS 28.541 3GPP TS 23.501"; key id; uses top3gpp:Top_Grp; container attributes { diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index ca4d7eaca..12887b68b 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -12,7 +12,7 @@ module _3gpp-common-fm { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines a Fault Management 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.623 @@ -25,7 +25,8 @@ module _3gpp-common-fm { Integration Reference Point (IRP); Information Service (IS)"; - revision 2023-09-17 { reference CR-0270 ; } + revision 2024-02-23 { reference CR-0347; } + revision 2023-09-17 { reference CR-0270; } revision 2023-05-09 { reference CR-0249; } revision 2022-10-31 { reference CR-0195; } revision 2021-08-08 { reference "CR-0132"; } @@ -445,7 +446,7 @@ module _3gpp-common-fm { description "Represents the AlarmList IOC."; leaf administrativeState { - type types3gpp:AdministrativeState ; + type types3gpp:BasicAdministrativeState ; default LOCKED; description "When set to UNLOCKED, the alarm list is updated. When the set to LOCKED, the existing alarm records are not diff --git a/yang-models/_3gpp-common-managed-function.yang b/yang-models/_3gpp-common-managed-function.yang index 7a2afd820..afa166483 100755 --- a/yang-models/_3gpp-common-managed-function.yang +++ b/yang-models/_3gpp-common-managed-function.yang @@ -13,7 +13,7 @@ module _3gpp-common-managed-function { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "The module defines a base class/grouping for major 3GPP functions. - Copyright 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.622 @@ -24,6 +24,7 @@ module _3gpp-common-managed-function { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2024-02-23 { reference CR-0347 ; } revision 2023-12-17 { reference CR-0327 ; } revision 2023-09-17 { reference CR-0270 ; } revision 2022-10-31 { reference CR-0195; } @@ -114,7 +115,7 @@ module _3gpp-common-managed-function { } leaf administrativeState { - type types3gpp:AdministrativeState; + type types3gpp:BasicAdministrativeState; mandatory true; description "Permission to use or prohibition against using the instance"; } diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index 4c184c57b..3940a8596 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 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.623 @@ -57,9 +57,10 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; + revision 2024-02-23 { reference CR-0347; } revision 2024-01-29 { reference "CR-0327"; } revision 2023-11-17 { reference "CR-0298"; } - revision 2023-11-05 { reference CR-0306 ; } + revision 2023-11-05 { reference CR-0306; } revision 2023-09-17 { reference CR-0270 ; } revision 2023-02-15 { reference "CR-0239";} revision 2022-11-03 { reference "CR-0193"; } @@ -242,7 +243,7 @@ module _3gpp-common-measurements { leaf administrativeState { default UNLOCKED; - type types3gpp:AdministrativeState ; + type types3gpp:BasicAdministrativeState ; description "Enable or disables production of the metrics"; } @@ -326,7 +327,7 @@ module _3gpp-common-measurements { leaf administrativeState { default UNLOCKED; - type types3gpp:AdministrativeState ; + type types3gpp:BasicAdministrativeState ; description "Enables or disables the ThresholdMonitor."; } diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 8122bcc3b..8ad80d956 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -13,22 +13,23 @@ module _3gpp-nr-nrm-gnbcucpfunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the GNBCUCPFunction 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-02-23 { reference CR-1219; } revision 2023-09-17 { reference CR-1042 ; } revision 2022-07-27 { reference "CR-0769"; } revision 2021-11-06 { reference "CR-0611" ; } revision 2021-11-05 { reference "CR-0609"; } - revision 2020-10-02 { reference CR-0384 ; } + revision 2020-10-02 { reference CR-0384; } revision 2020-08-06 { reference "CR-0333"; } revision 2020-08-03 { reference "CR-0321"; } revision 2020-06-03 { reference "CR-0286"; } - revision 2020-05-08 { reference S5-203316 ; } + revision 2020-05-08 { reference S5-203316; } revision 2020-04-28 { reference "0260"; } - revision 2020-02-14 { reference S5-20XXXX ; } - revision 2019-10-28 { reference S5-193518 ; } + revision 2020-02-14 { reference S5-20XXXX; } + revision 2019-10-28 { reference S5-193518; } revision 2019-06-17 { reference "Initial revision"; } feature DESManagementFunction { @@ -81,27 +82,27 @@ module _3gpp-nr-nrm-gnbcucpfunction { uses types3gpp:PLMNId; } - leaf-list x2BlackList { + leaf-list x2BlockList { type string; description "List of nodes to which X2 connections are prohibited."; } - leaf-list x2WhiteList { + leaf-list x2AllowList { type string; description "List of nodes to which X2 connections are enforced."; } - leaf-list xnBlackList { + leaf-list xnBlockList { type string; description "List of nodes to which Xn connections are prohibited."; } - leaf-list xnWhiteList { + leaf-list xnAllowList { type string; description "List of nodes to which X2 connections are enforced."; } - leaf-list xnHOBlackList { + leaf-list xnHOBlockList { type string; description "List of nodes to which handovers over Xn are prohibited."; } @@ -112,7 +113,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { supports (is associated to)."; } - leaf-list x2HOBlackList { + leaf-list x2HOBlockList { type string; description "List of nodes to which handovers over X2 are prohibited."; } -- GitLab