From 1e7e7ea39def9e1b16225045eb4de2acf814719a Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Tue, 16 Apr 2024 17:21:29 +0800 Subject: [PATCH 1/2] 28.624 cr0346 28.541 cd1218 --- yang-models/_3gpp-5gc-nrm-neffunction.yang | 5 +- yang-models/_3gpp-5gc-nrm-nfprofile.yang | 9 +- yang-models/_3gpp-5gc-nrm-nwdaffunction.yang | 354 ++++++++++++++++-- yang-models/_3gpp-common-fm.yang | 7 +- .../_3gpp-common-managed-function.yang | 7 +- ..._3gpp-common-managementdatacollection.yang | 19 +- yang-models/_3gpp-common-measurements.yang | 9 +- yang-models/_3gpp-common-yang-types.yang | 14 +- .../_3gpp-nr-nrm-eutranfreqrelation.yang | 13 +- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 19 +- yang-models/_3gpp-nr-nrm-nrfreqrelation.yang | 17 +- 11 files changed, 392 insertions(+), 81 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-neffunction.yang b/yang-models/_3gpp-5gc-nrm-neffunction.yang index f2b6f26f9..12f072aa4 100755 --- a/yang-models/_3gpp-5gc-nrm-neffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-neffunction.yang @@ -17,10 +17,11 @@ module _3gpp-5gc-nrm-neffunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the NEF function in 5GC. For more information about the NEF, 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-04-12 { reference CR-1218 ; } revision 2023-09-18 { reference CR-1103 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } @@ -161,7 +162,7 @@ module _3gpp-5gc-nrm-neffunction { yext3gpp:notNotifyable; key idx; leaf idx { type uint32 ; } - uses nfp3gpp:TaiRange; + uses nfp3gpp:TaiRangeGrp; } leaf nefId { diff --git a/yang-models/_3gpp-5gc-nrm-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-nfprofile.yang index 43f988955..15dc5e0a1 100755 --- a/yang-models/_3gpp-5gc-nrm-nfprofile.yang +++ b/yang-models/_3gpp-5gc-nrm-nfprofile.yang @@ -12,10 +12,11 @@ module _3gpp-5gc-nrm-nfprofile { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "NF profile class. - 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 29.510"; + revision 2024-04-12 { reference CR-1218 ; } revision 2023-11-18 { reference CR-1103 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-02-14 { reference CR-0891; } @@ -338,7 +339,7 @@ module _3gpp-5gc-nrm-nfprofile { min-elements 1; key idx; leaf idx { type uint32; } - uses TaiRange; + uses TaiRangeGrp; } list backupInfoAmfFailure { @@ -409,7 +410,7 @@ module _3gpp-5gc-nrm-nfprofile { min-elements 1; key idx; leaf idx { type uint32; } - uses TaiRange; + uses TaiRangeGrp; } leaf pgwFqdn { @@ -1055,7 +1056,7 @@ module _3gpp-5gc-nrm-nfprofile { } } - grouping TaiRange { + grouping TaiRangeGrp { list plmnId { description "PLMN ID related to the TacRange."; min-elements 1; diff --git a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang index 81e85cbfa..5fe7eb7ae 100755 --- a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang @@ -8,38 +8,288 @@ module _3gpp-5gc-nrm-nwdaffunction { import _3gpp-common-managed-element { prefix me3gpp; } import ietf-inet-types { prefix inet; } import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-common-top { prefix top3gpp; } + import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; } organization "3gpp SA5"; 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 2023-09-18 { reference CR-1043 ; } + revision 2024-04-12 { reference CR-1218; } + revision 2023-09-18 { reference CR-1043; } revision 2023-04-26 { reference CR-0916; } - revision 2020-11-08 { reference CR-0412 ; } + revision 2020-11-08 { reference CR-0412; } revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; } revision 2019-05-15 {reference "initial revision"; } + + typedef NwdafEvent { + description "The detailed ENUM value for NwdafEvent see the + Table 5.1.6.3.4-1 in TS 29.520"; + type union { + type enumeration { + enum SLICE_LOAD_LEVEL; + enum NETWORK_PERFORMANCE; + enum NF_LOAD; + enum SERVICE_EXPERIENCE; + enum UE_MOBILITY; + enum UE_COMMUNICATION; + enum QOS_SUSTAINABILITY; + enum ABNORMAL_BEHAVIOUR; + enum USER_DATA_CONGESTION; + enum NSI_LOAD_LEVEL; + enum DN_PERFORMANCE; + enum DISPERSION; + enum RED_TRANS_EXP; + enum WLAN_PERFORMANCE; + enum SM_CONGESTION; + } + type string; + } + } + + grouping NwdafCapabilityGrp { + description "This data type represents the capability supported by the + NWDAF."; + reference "TS 29.510"; + + leaf analyticsAggregation { + type boolean ; + default false; + description "It indicates whether the NWDAF supports analytics + aggregation"; + } + + leaf analyticsMetadataProvisioning { + type boolean ; + default false; + description "It indicate whether the NWDAF supports analytics metadata + provisioning:"; + } + } + + grouping MlAnalyticsInfoGrp { + description "This data type represents ML Analytics Filter information + supported by the Nnwdaf_MLModelProvision service."; + reference "TS 29.510"; + + leaf-list mlAnalyticsIds { + type NwdafEvent; + ordered-by user; + description "This attribute represents the Analytic functionalities + (identified by nwdafEvent defined in TS 29.520 [85]) of the NWDAF + instance. MnS consumer can configure this attribute to specify + which Analytic functionalities (identified by nwdafEvent) can be + performed the NWDAF instance. If the value of this attribute is not + present, the NWDAF instance can perform any NWDAFEvents + + Analytics Id(s) supported by the Nnwdaf_MLModelProvision service, + if none are provided the NWDAF can serve any mlAnalyticsId."; + } + + list sNSSAIList { + min-elements 1; + description "List of S-NSSAIs the managed object is capable of + supporting."; + reference "3GPP TS 23.003"; + key "sd sst"; + uses types5g3gpp:SNssai; + } + + list trackingAreaList { + description "This attribute represents area of Interest of the ML model, + if none are provided the ML model for the analytics can apply to any + TAIs. + + If present, it represents the list of TAIs, it may contain one or + more non-3GPP access TAIs."; + key idx ; + leaf idx { type uint32; } + uses types3gpp:TaiGrp; + } + + leaf-list mlModelInterInfo { + type string { + pattern "[0-9]{6}"; + } + description "This attribute defines the list of NWDAF vendors that are + allowed to retrieve ML models from the NWDAF containing MTLF. The + absence of this attribute indicates that none of the NWDAF vendors + can retrieve the ML models. + + allowedValues: 6 decimal digits; if the SMI code has less than + 6 digits, it shall be padded with leading digits '0' to complete a + 6-digit string value."; + } + + leaf flCapabilityType { + type enumeration { + enum FL_SERVER { + description "NWDAF containing MTLF as Federated Learning Server"; + } + enum FL_CLIENT { + description "NWDAF containing MTLF as Federated Learning Client"; + } + enum FL_SERVER_AND_CLIENT { + description "NWDAF containing MTLF as Federated Learning Server and + Client."; + } + } + description "This attribute defines the federated learning capability + type supported by NWDAF containing MTLF."; + } + + list flTimeInterval { + key idx ; + leaf idx { type uint32; } + description "This attribute defines the time window at which the + indicated flCapabilityType supported by NWDAF MTLF is available. + This attribute shall be present only if flCapabilityType attribute + is present."; + uses types3gpp:TimeWindowGrp; + } + } + + grouping NwdafInfoGrp { + description "This data type represents specific data for the NWDAF."; + reference "TS 29.510"; + + leaf-list nwdafEvents { + type NwdafEvent; + ordered-by user; + description "This attribute represents the Analytic functionalities + (identified by nwdafEvent defined in TS 29.520) of the NWDAF instance. + MnS consumer can configure this attribute to specify which Analytic + functionalities (identified by nwdafEvent) can be performed the NWDAF + instance. If the value of this attribute is not present, the NWDAF + instance can perform any NWDAFEvents. + The detailed ENUM value for NwdafEvent see the Table 5.1.6.3.4-1 + in TS 29.520"; + } + + leaf-list eventIds { + type string ; + min-elements 1; + description "It represents the EventId(s) supported by the + Nnwdaf_AnalyticsInfo service, if none are provided the NWDAF can serve + any eventId. (see clause TS 29.520)"; + } + + list taiList { + description "The list of TAIs. "; + min-elements 1; + key idx ; + leaf idx { type uint32; } + uses types3gpp:TaiGrp; + } + + list taiRangeList { + min-elements 1; + key idx ; + leaf idx { type uint32; } + description "The range of TAIs."; + uses nfp3gpp:TaiRangeGrp; + } + + list nwdafCapability { + max-elements 1; + key idx ; + leaf idx { type uint32; } + description "This attribute indicates the capability of the NWDAF. + If not present, the NWDAF shall be regarded with no capability."; + uses NwdafCapabilityGrp; + } + + leaf analyticsDelay { + type int32 ; + units seconds; + description "It represents the supported Analytics Delay related to the + eventIds and nwdafEvents. + It is an unsigned integer identifying a period of time in units of + seconds.(see clause 5.2.2 TS 29.571)."; + } + + leaf-list servingNfTypeList { + type types3gpp:NfType; + min-elements 1; + description "It contains the list of NF type(s) from which the NWDAF NF + can collect data. The absence of this attribute indicates that the + NWDAF can collect data from any NF type."; + } + + leaf-list servingNfSetIdList { + type string ; + min-elements 1; + description "It contains the list of NF type(s) from which the NWDAF NF + can collect data. The absence of this attribute indicates that the + NWDAF can collect data from any NF type. (see clause 5.4.2 NfSetId + in TS 29.571)"; + } + + list mlAnalyticsList { + min-elements 1; + key idx ; + leaf idx { type uint32; } + description "It represents ML Analytics Filter information supported by + the Nnwdaf_MLModelProvision service."; + uses MlAnalyticsInfoGrp; + } + } + + grouping NetworkSliceInfoGrp { + description "Represents information of network slice when the NWDAF is + authorized to collect the management data of the network slice. "; + + list sNSSAI { + description "It represents the S-NSSAI the NetworkSlice managed object + is supporting. The S-NSSAI is defined in TS 23.003 "; + key idx; + min-elements 1; + max-elements 1; + + leaf idx { + type string; + } + uses types5g3gpp:SNssai; + } + + leaf-list cNSIId { + type string; + description "It represents NSI ID which is an identifier for identifying + the Core Network part of a Network Slice instance when multiple + Network Slice instances of the same Network Slice are deployed, + and there is a need to differentiate between them in the 5GC. + See NSI ID definition in clause 3.1 of TS 23.501 and + subclause 6.1.6.2.7 of TS 29.531."; + } + + leaf networkSliceRef { + type types3gpp:DistinguishedName; + mandatory true; + description "This holds a DN of the NetworkSlice managed object relating + to the NetworkSlice instance differentiated by sNSSAI and optional + cNSIId."; + } + } grouping NWDAFFunctionGrp { description "Represents the NWDAFFunction IOC"; uses mf3gpp:ManagedFunctionGrp; - list pLMNIdList { - description "List of at most six entries of PLMN Identifiers, but at - least one (the primary PLMN Id). - The PLMN Identifier is composed of a Mobile Country Code (MCC) and a - Mobile Network Code (MNC)."; + list pLMNInfoList { + description "It defines the PLMN(s) of a Network Function."; - min-elements 1; - max-elements 6; - key "mcc mnc"; + min-elements 1; + key "idx"; + leaf idx { type uint32; } uses types3gpp:PLMNId; + uses types5g3gpp:SNssai; } leaf sBIFQDN { @@ -47,18 +297,7 @@ module _3gpp-5gc-nrm-nwdaffunction { interface."; type inet:domain-name; } - - list sNSSAIList { - description "List of S-NSSAIs the managed object is capable of supporting. - (Single Network Slice Selection Assistance Information) - An S-NSSAI has an SST (Slice/Service type) and an optional SD - (Slice Differentiator) field."; - //optional support - reference "3GPP TS 23.003"; - key "sd sst"; - uses types5g3gpp:SNssai; - } - + list managedNFProfile { key idx; min-elements 1; @@ -75,12 +314,77 @@ module _3gpp-5gc-nrm-nwdaffunction { reference "3GPP TS 23.501"; uses types5g3gpp:CommModel; } + + list networkSliceInfoList { + 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."; + leaf idx { + type string; + } + uses NetworkSliceInfoGrp; + yext3gpp:inVariant; + } + + list nwdafInfo { + min-elements 1; + max-elements 1; + key idx; + leaf idx { type uint32; } + description "It represents specific data for the NWDAF."; + uses NwdafInfoGrp; + } + + leaf administrativeState { + type types3gpp:BasicAdministrativeState ; + mandatory true; + description "This attribute determines whether the NWDAF is enabled or + disabled. MnS consumer can configure this attribute to activate or + de-activate the analytic functionalities (identified by nwdafEvent + defined in TS 29.520) of the NWDAF instance."; + } + + leaf nwdafLogicalFuncSupported { + type enumeration { + enum NWDAF_WITH_ANLF { + description "Indicates the NWDAF containing Analytics logical + function (AnLF)"; + } + enum NWDAF_WITH_MTLF { + description "Indicates the NWDAF containing Model Training logical + function (MTLF)."; + } + enum NWDAF_WITH_ANLF_MTLF { + description "Indicates the NWDAF containing both Analytics logical + function (AnLF) and Model Training logical function (MTLF)."; + } + } + config false; + description "It represents the logical functions supported by the NWDAF. + If not present, the NWDAF shall be regarded with no logical + decomposition, in that case the NWDAF only supports the analytics + services."; + } } augment "/me3gpp:ManagedElement" { list NWDAFFunction { - description "5G Core NWDAF Function"; - reference "3GPP TS 28.541"; + description "5G Core NWDAF Function. + For more information about the NWDAF, see TS 23.501. Several + attributes (including 'nwdafInfo', 'administrativeState' and + 'ManagedNFProfile.servingScope') are used to control the functionalities + (identified by nwdafEvent defined in TS 29.520) of the NWDAF instance. + + The attribute 'ManagedNFProfile.servingScope' is used to represent + specified certain geographical area(s) can be served by the NWDAF + instance. + + The attribute 'NwdafInfo.taiList' and 'NwdafInfo.taiRangeList' is used + to represent specified certain tracking area(s) can be served by the + NWDAF instance."; + 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 219bb3c0c..b7fa544c1 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -12,15 +12,16 @@ 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.111"; + revision 2024-02-24 { reference CR-0346; } revision 2024-01-18 { description "The specification of the file is moved from 28.623 to 28.532"; reference "28.623 CR-0315"; } - revision 2023-09-18 { reference CR-0271 ; } + revision 2023-09-18 { reference CR-0271; } revision 2023-05-10 { reference CR-0250; } revision 2022-10-24 { reference CR-0196; } revision 2021-08-08 { reference "CR-0132"; } @@ -441,7 +442,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 11131766d..ea4390cc3 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,7 +24,8 @@ module _3gpp-common-managed-function { 3GPP TS 28.620 Umbrella Information Model (UIM)"; - revision 2023-09-18 { reference CR-0271 ; } + revision 2024-02-24 { reference CR-0346; } + revision 2023-09-18 { reference CR-0271; } revision 2023-04-26 { reference CR-0250; } revision 2023-02-14 { reference "CR-0234"; } revision 2022-11-02 { reference "CR-0753"; } @@ -116,7 +117,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-managementdatacollection.yang b/yang-models/_3gpp-common-managementdatacollection.yang index 7b5c30180..2a6ffea33 100644 --- a/yang-models/_3gpp-common-managementdatacollection.yang +++ b/yang-models/_3gpp-common-managementdatacollection.yang @@ -6,15 +6,13 @@ module _3gpp-common-managementdatacollection { import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-yang-types {prefix types3gpp; } import _3gpp-common-yang-extensions {prefix yext3gpp; } - //import ietf-inet-types { prefix inet; } - import ietf-yang-types { prefix yang; } import _3gpp-common-subnetwork { prefix subnet3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Handling management data collection - 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 Generic Network Resource Model (NRM) @@ -26,6 +24,7 @@ module _3gpp-common-managementdatacollection { Integration Reference Point (IRP); Information Service (IS)"; + revision 2024-04-12 { reference CR-0346; } revision 2023-11-18 { reference CR-0299 ; } revision 2023-11-06 { reference "CR-0305"; } revision 2023-09-18 { reference CR-0271 ; } @@ -168,18 +167,6 @@ module _3gpp-common-managementdatacollection { description ""; } - grouping TimeWindowGrp { - leaf startTime { - type yang:date-and-time; - yext3gpp:inVariant; - } - leaf endTime { - type yang:date-and-time; - yext3gpp:inVariant; - } - } - - grouping ManagementDataCollectionGrp { choice managementData { @@ -264,7 +251,7 @@ module _3gpp-common-managementdatacollection { max-elements 1; description "Collection time window for which the management data should be reported."; - uses TimeWindowGrp; + uses types3gpp:TimeWindowGrp; } list reportingCtrl { diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index 6bb0d0796..6d9f54ce1 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 Generic Network Resource Model (NRM) @@ -56,8 +56,9 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; + revision 2024-02-24 { reference CR-0346; } revision 2023-11-18 { reference "CR-0299 CR-0305"; } - revision 2023-09-18 { reference CR-0271 ; } + revision 2023-09-18 { reference CR-0271; } revision 2023-04-26 { reference CR-0250; } revision 2023-02-18 { reference "CR-0240"; } revision 2023-02-14 { reference "CR-0234"; } @@ -249,7 +250,7 @@ module _3gpp-common-measurements { leaf administrativeState { default UNLOCKED; - type types3gpp:AdministrativeState ; + type types3gpp:BasicAdministrativeState ; description "Enable or disables production of the metrics"; } @@ -333,7 +334,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-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 6a7865341..b80ef6430 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -12,10 +12,11 @@ module _3gpp-common-yang-types { description "The model defines a YANG mapping of the top level information classes used for management of 5G networks and network slicing. - Copyright 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"; + revision 2024-04-12 { reference CR-0346; } revision 2023-11-06 { reference CR-0305; } revision 2023-09-18 { reference CR-0271 ; } revision 2023-08-09 { reference CR-0266; } @@ -67,6 +68,17 @@ module _3gpp-common-yang-types { leaf name { type string; } leaf value { type string; } } + + grouping TimeWindowGrp { + leaf startTime { + type yang:date-and-time; + yext3gpp:inVariant; + } + leaf endTime { + type yang:date-and-time; + yext3gpp:inVariant; + } + } grouping ProcessMonitorGrp { description "Provides attributes to monitor the progress of processes diff --git a/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang b/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang index 72e635b76..0ebea1981 100755 --- a/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang +++ b/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang @@ -13,11 +13,12 @@ module _3gpp-nr-nrm-eutranfreqrelation { organization "3GPP SA5"; description "Defines the YANG mapping of the EUtranFreqRelation Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2023-09-18 { reference CR-1043 ; } + revision 2024-02-24 { reference CR-1218; } + revision 2023-09-18 { reference CR-1043; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { description "Initial revision"; @@ -38,17 +39,17 @@ module _3gpp-nr-nrm-eutranfreqrelation { type types3gpp:QOffsetRange; } - leaf-list blackListEntry { + leaf-list blockListEntry { description "A list of Physical Cell Identities (PCIs) that are - blacklisted in E-UTRAN measurements."; + blocklisted in E-UTRAN measurements."; reference "3GPP TS 38.331"; min-elements 0; type uint16 { range "0..1007"; } } - leaf-list blackListEntryIdleMode { + leaf-list blockListEntryIdleMode { description "A list of Physical Cell Identities (PCIs) that are - blacklisted in SIB4 and SIB5."; + blocklisted in SIB4 and SIB5."; min-elements 0; type uint16 { range "0..1007"; } } diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index d7e206c64..ec2f6db3a 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -19,13 +19,14 @@ module _3gpp-nr-nrm-gnbcucpfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2024-01-12 { reference CR-1138 ; } - revision 2023-09-18 { reference CR-1043 ; } + revision 2024-02-24 { reference CR-1218; } + revision 2024-01-12 { reference CR-1138; } + revision 2023-09-18 { reference CR-1043; } revision 2023-04-26 { reference CR-0916; } revision 2022-07-28 { reference "CR-0770"; } 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"; } @@ -90,27 +91,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."; } @@ -121,7 +122,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."; } diff --git a/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang b/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang index b8f79d4c2..90705d9b9 100755 --- a/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang +++ b/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang @@ -12,14 +12,15 @@ module _3gpp-nr-nrm-nrfreqrelation { organization "3GPP SA5"; description "Defines the YANG mapping of the NRFreqRelation Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2023-09-18 { reference CR-1043 ; } + revision 2024-02-24 { reference CR-1218; } + revision 2023-09-18 { reference CR-1043; } revision 2023-04-26 { reference CR-0916; } - revision 2020-04-23 { reference CR0281 ; } - revision 2019-10-28 { reference S5-193518 ; } + revision 2020-04-23 { reference CR-0281; } + revision 2019-10-28 { reference S5-193518; } revision 2019-06-17 { description "Initial revision"; } @@ -75,17 +76,17 @@ module _3gpp-nr-nrm-nrfreqrelation { } } - leaf-list blackListEntry { + leaf-list blockListEntry { description "A list of Physical Cell Identities (PCIs) that are - blacklisted in NR measurements."; + blocklisted in NR measurements."; reference "3GPP TS 38.331"; min-elements 0; type uint16 { range "0..1007"; } } - leaf-list blackListEntryIdleMode { + leaf-list blockListEntryIdleMode { description "A list of Physical Cell Identities (PCIs) that are - blacklisted in SIB4 and SIB5."; + blocklisted in SIB4 and SIB5."; min-elements 0; type uint16 { range "0..1007"; } } -- GitLab From efc2c4eb8f12d7fdc23ac3855eeb22502d986cbe Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 18 Apr 2024 02:26:20 +0800 Subject: [PATCH 2/2] corrected gnbdu and operatordu 2 --- yang-models/_3gpp-nr-nrm-gnbdufunction.yang | 5 +++-- yang-models/_3gpp-nr-nrm-operatordu.yang | 25 ++++++++++++++------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang index 06928d800..ca3c6f768 100755 --- a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang @@ -14,10 +14,11 @@ module _3gpp-nr-nrm-gnbdufunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the GNBDUFunction 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-24 { reference CR-1218; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2022-11-02 { reference "CR-0753"; } @@ -183,7 +184,6 @@ module _3gpp-nr-nrm-gnbdufunction { information derived from the detected RIM-RS to OAM."; uses RimRSReportConfGrp; } - } leaf configurable5QISetRef { type types3gpp:DistinguishedName; @@ -195,6 +195,7 @@ module _3gpp-nr-nrm-gnbdufunction { type types3gpp:DistinguishedName; description "DN of the Dynamic5QISet that the GNBDUFunction supports (is associated to)."; } + } augment "/me3gpp:ManagedElement" { diff --git a/yang-models/_3gpp-nr-nrm-operatordu.yang b/yang-models/_3gpp-nr-nrm-operatordu.yang index 1c708e52b..98a702b77 100755 --- a/yang-models/_3gpp-nr-nrm-operatordu.yang +++ b/yang-models/_3gpp-nr-nrm-operatordu.yang @@ -12,10 +12,11 @@ module _3gpp-nr-nrm-operatordu { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the OperatorDU 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-24 { reference CR-1218; } revision 2023-11-14 { reference "CR1136"; } revision 2023-09-30 { reference "CR1048"; } revision 2023-09-18 { reference CR-1043 ; } @@ -24,14 +25,22 @@ module _3gpp-nr-nrm-operatordu { grouping OperatorDUGrp { description "Represents the OperatorDU IOC."; reference "3GPP TS 28.541"; - uses gnbdu3gpp:GNBDUFunctionGrp { - refine gNBId { - mandatory true; - } - refine gNBIdLength { - mandatory true; - } + + leaf gNBId { + type int64 { range "0..4294967295"; } + mandatory true; + description "Identifies a gNB within a PLMN. The gNB Identifier (gNB ID) + is part of the NR Cell Identifier (NCI) of the gNB cells."; + reference "gNB ID in 3GPP TS 38.300, Global gNB ID in 3GPP TS 38.413"; + } + + leaf gNBIdLength { + type int32 { range "22..32"; } + mandatory true; + description "Indicates the number of bits for encoding the gNB ID."; + reference "gNB ID in 3GPP TS 38.300, Global gNB ID in 3GPP TS 38.413"; } + leaf configurable5QISetRef { type types3gpp:DistinguishedName; description "DN of the Configurable5QISet that the OperatorDU -- GitLab