From 5ff1c53048edcbe6d27c36a46b70725d861f1791 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 31 Jan 2025 14:26:19 +0100 Subject: [PATCH 01/94] yang implementation CR1442 --- .../_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang | 5 +- yang-models/_3gpp-5gc-nrm-neffunction.yang | 5 +- yang-models/_3gpp-5gc-nrm-nfprofile.yang | 41 +++---- yang-models/_3gpp-5gc-nrm-nfservice.yang | 109 +++++++++++++----- yang-models/_3gpp-5gc-nrm-nrffunction.yang | 5 +- yang-models/_3gpp-common-yang-types.yang | 98 +++++++++++++++- .../_3gpp-nr-nrm-eutranfreqrelation.yang | 5 +- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 13 ++- yang-models/_3gpp-nr-nrm-nrcelldu.yang | 46 +------- yang-models/_3gpp-nr-nrm-nrfreqrelation.yang | 5 +- yang-models/_3gpp-nr-nrm-nrfrequency.yang | 5 +- .../_3gpp-ns-nrm-networkslicesubnet.yang | 39 +++++-- yang-models/_3gpp-ns-nrm-sliceprofile.yang | 54 +-------- 13 files changed, 260 insertions(+), 170 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang b/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang index 10e0ee414..82d33842e 100755 --- a/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang +++ b/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang @@ -11,10 +11,11 @@ module _3gpp-5gc-nrm-FiveQiDscpMappingSet { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description " This IOC represents the set of mapping between 5QIs and DSCP. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-01-25 { reference CR-1442 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2020-08-03 { reference "CR-0321"; } revision 2020-05-27 { reference "CR-0287"; } @@ -38,7 +39,7 @@ module _3gpp-5gc-nrm-FiveQiDscpMappingSet { grouping FiveQiDscpMappingSetGrp { description "Represents the FiveQiDscpMappingSet IOC."; - list FiveQiDscpMappingList { + list fiveQiDscpMappingList { key "dscp"; uses FiveQiDscpMapping; } diff --git a/yang-models/_3gpp-5gc-nrm-neffunction.yang b/yang-models/_3gpp-5gc-nrm-neffunction.yang index fec93a992..1c48c30c8 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 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-01-25 { reference CR-1442 ; } revision 2024-05-18 { reference CR-1273 ; } revision 2024-04-12 { reference CR-1218 ; } revision 2023-09-18 { reference CR-1103 ; } @@ -156,7 +157,7 @@ module _3gpp-5gc-nrm-neffunction { uses types3gpp:TaiGrp; } - list taiRangelist { + list taiRangeList { config false; description "Range of TAIs"; yext3gpp:inVariant; diff --git a/yang-models/_3gpp-5gc-nrm-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-nfprofile.yang index 15dc5e0a1..35ed626ff 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 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 29.510"; + revision 2025-01-25 { reference CR-1442 ; } revision 2024-04-12 { reference CR-1218 ; } revision 2023-11-18 { reference CR-1103 ; } revision 2023-09-18 { reference CR-1043 ; } @@ -23,7 +24,7 @@ module _3gpp-5gc-nrm-nfprofile { revision 2019-06-17 { reference "initial revision"; } grouping NFProfileGrp { - leaf nfInstanceID { + leaf nfInstanceId { description "String uniquely identifying a NF instance."; mandatory true; type string; @@ -588,8 +589,8 @@ module _3gpp-5gc-nrm-nfprofile { locally configured in the NRF or the NRF received during NF registration."; - key nfInstanceID; - leaf nfInstanceID { + key nfInstanceId; + leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } @@ -604,8 +605,8 @@ module _3gpp-5gc-nrm-nfprofile { locally configured in the NRF or the NRF received during NF registration."; - key nfInstanceID; - leaf nfInstanceID { + key nfInstanceId; + leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } @@ -620,8 +621,8 @@ module _3gpp-5gc-nrm-nfprofile { locally configured in the NRF or the NRF received during NF registration."; - key nfInstanceID; - leaf nfInstanceID { + key nfInstanceId; + leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } @@ -636,8 +637,8 @@ module _3gpp-5gc-nrm-nfprofile { locally configured in the NRF or the NRF received during NF registration."; - key nfInstanceID; - leaf nfInstanceID { + key nfInstanceId; + leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } @@ -652,8 +653,8 @@ module _3gpp-5gc-nrm-nfprofile { locally configured in the NRF or the NRF received during NF registration."; - key nfInstanceID; - leaf nfInstanceID { + key nfInstanceId; + leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } @@ -668,8 +669,8 @@ module _3gpp-5gc-nrm-nfprofile { locally configured in the NRF or the NRF received during NF registration."; - key nfInstanceID; - leaf nfInstanceID { + key nfInstanceId; + leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } @@ -684,8 +685,8 @@ module _3gpp-5gc-nrm-nfprofile { locally configured in the NRF or the NRF received during NF registration."; - key nfInstanceID; - leaf nfInstanceID { + key nfInstanceId; + leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } @@ -700,8 +701,8 @@ module _3gpp-5gc-nrm-nfprofile { locally configured in the NRF or the NRF received during NF registration."; - key nfInstanceID; - leaf nfInstanceID { + key nfInstanceId; + leaf nfInstanceId{ description "String uniquely identifying a NF instance."; type string; } @@ -716,8 +717,8 @@ module _3gpp-5gc-nrm-nfprofile { locally configured in the NRF or the NRF received during NF registration."; - key nfInstanceID; - leaf nfInstanceID { + key nfInstanceId; + leaf nfInstanceId { description "String uniquely identifying a NF instance."; type string; } diff --git a/yang-models/_3gpp-5gc-nrm-nfservice.yang b/yang-models/_3gpp-5gc-nrm-nfservice.yang index 82cf61e87..d3d3a71cd 100755 --- a/yang-models/_3gpp-5gc-nrm-nfservice.yang +++ b/yang-models/_3gpp-5gc-nrm-nfservice.yang @@ -12,10 +12,11 @@ module _3gpp-5gc-nrm-nfservice { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "NF service class. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 29.510"; + revision 2025-01-25 { reference CR-1442; } revision 2023-09-18 { reference CR-1043 ; } revision 2021-01-25 { reference CR-0454 ; } revision 2020-11-05 { reference CR-0412 ; } @@ -98,7 +99,7 @@ module _3gpp-5gc-nrm-nfservice { uses types3gpp:DefaultNotificationSubscription; } - list allowedPlmns { + list allowedPLMNs { description "PLMNs allowed to access the service instance. The absence of this attribute indicates that any PLMN is allowed to access the service instance."; @@ -108,15 +109,21 @@ module _3gpp-5gc-nrm-nfservice { key "mcc mnc"; uses types3gpp:PLMNId; } - - leaf-list allowedNfTypes { - description "Type of the NFs allowed to access the service instance. - The absence of this attribute indicates that any NF type is allowed - to access the service instance."; + list allowedSnpns { + description "PLMNs allowed to access the service instance. + The absence of this attribute indicates that any PLMN is allowed to + access the service instance."; min-elements 1; //optional support - type types3gpp:NfType; + key "mcc mnc"; + uses types3gpp:PLMNId; + } + leaf-list allowedNfTypes { + description "SNPNs allowed to access the NF instance"; + min-elements 1; + //optional support + type types3gpp:NfType; } leaf-list allowedNfDomains { @@ -126,7 +133,7 @@ module _3gpp-5gc-nrm-nfservice { type string; } - list allowedNssais { + list allowedNSSAI { description "S-NSSAI of the allowed slices to access the service instance. The absence of this attribute indicates that any slice is allowed to access the service instance."; @@ -135,13 +142,51 @@ module _3gpp-5gc-nrm-nfservice { key "sd sst"; uses types5g3gpp:SNssai; } - + leaf-list allowedOperationsPerNfType { + description "It indicates the allowed operations on resources for each type + of NF; the key of the map is the NF Type, and the value is an array of scopes"; + //optional support + type string; + min-elements 1; + } + leaf-list allowedOperationsPerNfInstance { + description "It indicates the allowed operations on resources for a given NF + Instance; the key of the map is the NF Instance Id, and the value is an array of scopes"; + //optional support + type string; + min-elements 1; + } + leaf allowedOperationsPerNfInstanceOverrides { + type boolean; + default false; + description "When it is present and set to true, indicates that the scopes defined in + attribute allowedOperationsPerNfInstance for a given NF Instance ID take precedence over + the scopes defined in attribute allowedOperationsPerNfType for the corresponding NF type + of the NF Instance associated to such NF Instance ID.."; + } + + leaf-list oauth2Required { + type boolean; + max-elements 1; + description "It indicates whether the NF Service Instance requires Oauth2-based authorization"; + } + + leaf-list sharedServiceDataId { + type string; + max-elements 1; + description "String uniquely identifying SharedServiceData. The format of the + sharedServiceDataId shall be a Universally Unique Identifier (UUID) version 4, + as described in IETF RFC 4122 [44]. The hexadecimal letters should be formatted + as lower-case characters by the sender, and they shall be handled as case-insensitive + by the receiver."; + } + leaf priority { description "Priority (relative to other services of the same type) in the range of 0-65535, to be used for NF Service selection; lower values indicate a higher priority."; //optional support - type uint16; + type uint16 { range "0..65535"; } } leaf capacity { @@ -151,31 +196,17 @@ module _3gpp-5gc-nrm-nfservice { type uint16; } - leaf load { - description "Dynamic load information, ranged from 0 to 100, indicates - the current load percentage of the NF Service."; - //optional support - type types3gpp:Load; - } - + leaf recoveryTime { description "Timestamp when the NF was (re)started."; //optional support type yang:date-and-time; } - - list chfServiceInfo { //is the key unique - description "Specific data for a CHF service instance."; - //optional support - max-elements 1; - key "primaryChfServiceInstance secondaryChfServiceInstance"; - uses ChfServiceInfo; - } - - leaf supportedFeatures { - description "Supported Features of the NF Service instance."; + + leaf vendorId { + description "Vendor ID of the NF instance"; //optional support - type SupportedFeatures; + type string; } } @@ -302,4 +333,22 @@ module _3gpp-5gc-nrm-nfservice { type string; } } + grouping SNPNIdGrp { + description "This <> represents the information of a SNPN + identification"; + leaf mCC { + description "This is the Mobile Country Code (MCC) of the PLMN + identifier. See TS 23.003 [13] subclause 2.2 and 12.1"; + type string; + } + leaf mNC { + description "This is the Mobile Network Code (MNC) of the PLMN identifier. + See TS 23.003 [13] subclause 2.2 and 12.1."; + type string; + } + leaf nId { + description "Network Identity; Shall be present if PlmnIdNid identifies an SNPN"; + type string; + } + } } \ No newline at end of file diff --git a/yang-models/_3gpp-5gc-nrm-nrffunction.yang b/yang-models/_3gpp-5gc-nrm-nrffunction.yang index 25507c96a..e8a8ff3bc 100755 --- a/yang-models/_3gpp-5gc-nrm-nrffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nrffunction.yang @@ -16,10 +16,11 @@ module _3gpp-5gc-nrm-nrffunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the NRF function in 5GC. For more information about the NRF, see 3GPP TS 23.501 [2]. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-01-25 { reference CR-1442 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2020-11-08 { reference CR-0412 ; } @@ -72,7 +73,7 @@ module _3gpp-5gc-nrm-nrffunction { list nFProfileList { description "Set of NFProfile(s) to be registered in the NRF instance."; //optional support - key nfInstanceID; + key nfInstanceId; uses nfp3gpp:NFProfileGrp; } } diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 37fadf04a..0195a23c3 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -12,10 +12,12 @@ module _3gpp-common-yang-types { description "The model defines a YANG mapping of the top level information classes used for management of 5G networks and network slicing. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623"; + revision 2024-11-25 { reference CR-1442; } + revision 2024-11-25 { reference CR-1412; } revision 2024-11-01 { reference CR-0463; } revision 2024-08-13 { reference CR-0387; } revision 2024-05-18 { reference CR-0359; } @@ -299,6 +301,44 @@ module _3gpp-common-yang-types { yext3gpp:notNotifyable; } } + grouping NPNIdGrp { + description "Represents the NPN supported by the <> using this + <> as one of its attributes in case of the cell is a + NPN-only cell."; + + list plmnid { + key "mcc mnc"; + min-elements 1; + description "PLMNId"; + uses types3gpp:PLMNId; + } + + leaf cAGIdList { + type string; + mandatory true; + description "It identifies a CAG list containing up to 12 CAG-identifiers + per PLMN Identity, see TS 38.331. + + CAG is used for the PNI-NPNs to prevent UE(s), which are not allowed + to access the NPN via the associated cell(s), from automatically + selecting and accessing the associated CAG cell(s). + + CAG ID is used to combine with PLMN ID to identify a PNI-NPN. + + Exist if the cell is a NPN-only cell see TS 38.331"; + } + + leaf nIDList { + type string; + mandatory true; + description "It identifies a list of NIDs containing up to 12 NIDs per + PLMN Identity, see TS 38.331. + + NID is used to combine with PLMN ID to identify an SNPN. + + Exist if the cell is a NPN-only cell see TS 38.331"; + } + } typedef TenthOfDegrees { type uint16 { @@ -369,7 +409,7 @@ module _3gpp-common-yang-types { leaf idx { type uint32 ; } - leaf nfInstanceID { + leaf nfInstanceId { config false; mandatory true; type yang:uuid ; @@ -829,6 +869,11 @@ module _3gpp-common-yang-types { type inet:uri; } + leaf interPlmnCallbackUri { + description "It indicates the callback URI to be used by NF Service + Producers located in PLMNs that are different from the PLMN of the NF consumer."; + type inet:uri; + } leaf n1MessageClass { type N1MessageClass; } @@ -836,6 +881,55 @@ module _3gpp-common-yang-types { leaf n2InformationClass { type N2InformationClass; } + + leaf versions { + description "This attribute identifies the API versions + (e.g. v1) supported for the default notification type"; + //optional + type N2InformationClass; + } + leaf binding { + description "This attribute shall contain the value of the Binding Indication + for the default subscription notification "; + reference " i.e. the value part of 3gpp-Sbi-Binding header, as specified in + clause 6.12.4 of 3GPP TS 29.500 76. "; + //optional + type string; + config false; + } + leaf acceptedEncoding { + description "It indicates the content encodings that are accepted by a NF Service + Consumer when receiving a notification related to a default notification subscription"; + reference "IETF RFC 9110 clause 12.5.3 "; + //optional + type string; + config false; + } + leaf supportedFeatures { + description "It is a string, which indicates the features of the service corresponding + to the subscribed default notification, which are supported by the NF (Service) instance + acting as NF service consumer. The string shall contain a bitmask indicating supported + features in hexadecimal representation:Each character in the string shall take a value + of 0 to 9, a to f or A to F "; + reference "shall represent the support of 4 features as described in table 5.2.2-3 of TS 29.571 [61]."; + //optional + type string; + config false; + } + leaf serviceInfoList { + description "It indicates a list of service specific information. It may be present + when the notification request of the notification type may be generated by multiple + services, i.e. notifications from different services may be received by the subscription."; + //optional + type string; + config false; + } + leaf callbackUriPrefix { + description "It indicates the optional path segment(s) used to construct the prefix of the + Callback URIs during the reselection of an NF service consumer, as described in 3GPP TS 29.501"; + //optional + type inet:uri; + } } grouping Ipv4AddressRange { diff --git a/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang b/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang index 0ebea1981..b5479dfd0 100755 --- a/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang +++ b/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang @@ -13,10 +13,11 @@ 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 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-01-25 { reference CR-; } revision 2024-02-24 { reference CR-1218; } revision 2023-09-18 { reference CR-1043; } revision 2019-10-28 { reference S5-193518 ; } @@ -44,7 +45,7 @@ module _3gpp-nr-nrm-eutranfreqrelation { blocklisted in E-UTRAN measurements."; reference "3GPP TS 38.331"; min-elements 0; - type uint16 { range "0..1007"; } + type uint16 { range "0..503"; } } leaf-list blockListEntryIdleMode { diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index aaf83c7ee..9b0452ac3 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -16,10 +16,11 @@ 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 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-01-25 { reference "CR-1442"; } revision 2024-11-07 { reference "CR-1443"; } revision 2024-08-19 { reference "CR-1405"; } revision 2024-08-19 { reference "CR-1337 CR-1352"; } @@ -87,7 +88,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { description "This data type represents the properties describing the mapping relationship between set ID and backhaul address of gNB."; - leaf setID { + leaf setId { type uint32 { range 0..4194304; // 22 bits } @@ -109,7 +110,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { } } - grouping tceIDMappingInfoGrp { + grouping TceIDMappingInfoGrp { description "This data type represents the properties describing the mapping relationship between TCE ID, PLMN where TCE resides and IP address of TCE."; @@ -236,7 +237,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { min-elements 1; key idx; leaf idx { type uint32; } - uses tceIDMappingInfoGrp; + uses TceIDMappingInfoGrp; } leaf dDAPSHOControl { @@ -311,6 +312,10 @@ module _3gpp-nr-nrm-gnbcucpfunction { NRECMappingRule contained by parent, e.g. ManagedElement or SubNetwork, applies."; } + + leaf mWABRef { + type types3gpp:DistinguishedName; + } } grouping QceIdMappingInfoGrp { diff --git a/yang-models/_3gpp-nr-nrm-nrcelldu.yang b/yang-models/_3gpp-nr-nrm-nrcelldu.yang index da3e12195..94420e4df 100755 --- a/yang-models/_3gpp-nr-nrm-nrcelldu.yang +++ b/yang-models/_3gpp-nr-nrm-nrcelldu.yang @@ -15,10 +15,11 @@ module _3gpp-nr-nrm-nrcelldu { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the NRCellDU Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 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-05-25 { reference CR-1412 ; } revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-07-28 { reference "CR-0770"; } @@ -42,46 +43,7 @@ module _3gpp-nr-nrm-nrcelldu { description "Class representing Centralized SON function of PCI configuration feature"; } - - grouping NPNIdentityGrp { - description "Represents the NPN supported by the <> using this - <> as one of its attributes in case of the cell is a - NPN-only cell."; - - list plmnid { - key "mcc mnc"; - min-elements 1; - description "PLMNId"; - uses types3gpp:PLMNId; - } - - leaf cAGIdList { - type string; - mandatory true; - description "It identifies a CAG list containing up to 12 CAG-identifiers - per PLMN Identity, see TS 38.331. - - CAG is used for the PNI-NPNs to prevent UE(s), which are not allowed - to access the NPN via the associated cell(s), from automatically - selecting and accessing the associated CAG cell(s). - - CAG ID is used to combine with PLMN ID to identify a PNI-NPN. - - Exist if the cell is a NPN-only cell see TS 38.331"; - } - - leaf nIDList { - type string; - mandatory true; - description "It identifies a list of NIDs containing up to 12 NIDs per - PLMN Identity, see TS 38.331. - - NID is used to combine with PLMN ID to identify an SNPN. - - Exist if the cell is a NPN-only cell see TS 38.331"; - } - } - + grouping NRCellDUGrp { description "Represents the NRCellDU IOC."; reference "3GPP TS 28.541"; @@ -143,7 +105,7 @@ module _3gpp-nr-nrm-nrcelldu { corresponding PNI-NPN or SNPN in case of the cell is NPN-only cell."; reference "3GPP TS 38.331"; leaf idx { type uint32 ; } - uses NPNIdentityGrp; + uses types3gpp:NPNIdGrp; } leaf nRPCI { diff --git a/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang b/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang index 90705d9b9..46b942353 100755 --- a/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang +++ b/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang @@ -12,10 +12,11 @@ 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 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-01-25 { reference CR-; } revision 2024-02-24 { reference CR-1218; } revision 2023-09-18 { reference CR-1043; } revision 2023-04-26 { reference CR-0916; } @@ -81,7 +82,7 @@ module _3gpp-nr-nrm-nrfreqrelation { blocklisted in NR measurements."; reference "3GPP TS 38.331"; min-elements 0; - type uint16 { range "0..1007"; } + type uint16 { range "0..503"; } } leaf-list blockListEntryIdleMode { diff --git a/yang-models/_3gpp-nr-nrm-nrfrequency.yang b/yang-models/_3gpp-nr-nrm-nrfrequency.yang index a1589ef2b..1ae6f94fc 100755 --- a/yang-models/_3gpp-nr-nrm-nrfrequency.yang +++ b/yang-models/_3gpp-nr-nrm-nrfrequency.yang @@ -11,10 +11,11 @@ module _3gpp-nr-nrm-nrfrequency { organization "3GPP SA5"; description "Defines the YANG mapping of the NRFrequency 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 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-01-25 { reference CR-1442 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { @@ -33,7 +34,7 @@ module _3gpp-nr-nrm-nrfrequency { type uint32 { range "0.. 3279165"; } } - leaf sSBSubCarrierSpacing { + leaf ssBSubCarrierSpacing { description "Sub-carrier spacing of the SSB."; mandatory true; type uint8 { range "15 | 30 | 60 | 120"; } diff --git a/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang b/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang index 3453e5166..7aba7f7e6 100755 --- a/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang +++ b/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang @@ -15,7 +15,7 @@ module _3gpp-ns-nrm-networkslicesubnet { "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the properties of a network slice subnet instance in a 5G network. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 Management and orchestration; @@ -23,6 +23,7 @@ module _3gpp-ns-nrm-networkslicesubnet { Information model definitions for network slice NRM (chapter 6) "; + revision 2025-01-25 { reference CR-1412 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-07-26 { reference CR-0770 ; } revision 2021-05-05 { @@ -45,7 +46,27 @@ module _3gpp-ns-nrm-networkslicesubnet { type string; reference "ETSI GS NFV-IFA 013"; } - + grouping ConnectionPointInfoGrp { + description "TThis datatype contains information required to identify a + connection point outside of scope of 3GPP MIB (e.g. transport domain), "; + reference "FC 8345 [89] and YANG Data Models for 'Attachment + Circuits'-as-a-Service (ACaaS) [90]"; + leaf connectionPointId { + description "This parameter specifies the identifier of a TN object"; + type string; + } + leaf connectionPointIdType { + description "This parameter specifies the type of the connection point identifier"; + type enumeration { + enum VLAN; + enum MPLS; + enum SEGMENT; + enum IPV4; + enum IPV6; + enum ATTACHMENT_CIRCUIT; + } + } + } grouping EPTransportGrp { leaf ipAddress { description "This parameter specifies the IP address assigned to a @@ -61,13 +82,6 @@ module _3gpp-ns-nrm-networkslicesubnet { mandatory true; type string; } - leaf-list nextHopInfo { - description "This parameter is used to identify ingress transport - node. Each node can be identified by any of combination of IP - address of next-hop router of transport network, system name, - port name, IP management address of transport nodes."; - type string; - } leaf-list qosProfile { description "This parameter specifies reference to QoS Profile for a logical transport interface. A QoS profile includes a set of @@ -81,8 +95,13 @@ module _3gpp-ns-nrm-networkslicesubnet { min-elements 1; type types3gpp:DistinguishedName; } + list externalEndPointRefList { + description "This parameter is used to identify a list of connection + point info(s)"; + uses ConnectionPointInfoGrp; + } uses top3gpp:Top_Grp; - } + } grouping NsInfoGrp { description "The NsInfo of the NS instance corresponding to the network diff --git a/yang-models/_3gpp-ns-nrm-sliceprofile.yang b/yang-models/_3gpp-ns-nrm-sliceprofile.yang index 8745dd815..6ba9a70cb 100755 --- a/yang-models/_3gpp-ns-nrm-sliceprofile.yang +++ b/yang-models/_3gpp-ns-nrm-sliceprofile.yang @@ -13,7 +13,7 @@ submodule _3gpp-ns-nrm-sliceprofile { description "Represents the properties of network slice subnet related requirement that should be supported by the network slice subnet instance in a 5G network. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 Management and orchestration; @@ -21,6 +21,7 @@ submodule _3gpp-ns-nrm-sliceprofile { Information model definitions for network slice NRM (chapter 6) "; + revision 2025-01-25 { reference CR-1442; } revision 2023-11-04 { reference CR-1129; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } @@ -502,6 +503,7 @@ submodule _3gpp-ns-nrm-sliceprofile { list maxNumberofPDUSessions { description "Represents the maximum number of concurrent PDU sessions supported by the network slice"; + //optional config false; key idx; max-elements 1; @@ -621,54 +623,6 @@ submodule _3gpp-ns-nrm-sliceprofile { } } - grouping PositioningRANSubnetGrp { - description "Represents positioning support in RAN domain"; - leaf-list availability { - type enumeration { - enum CIDE_CID ; - enum OTDOA; - enum RF_FINGERPRINTING; - enum AECID; - enum HYBRID_POSITIONING; - enum NET_RTK; - } - config false; - description "Specifies if this attribute is provided by the RAN domain - of the network slice and contains a list of positioning methods - provided by the RAN domain. If the list is empty this attribute is - not available in the RAN domain and the other parameters might be - ignored, see NG.116. Values allowed: are - CIDE-CID (LTE and NR), OTDOA (LTE and NR), RF fingerprinting, AECID, - Hybrid positioning, NET-RTK."; - } - leaf predictionfrequency { - type enumeration { - enum PERSEC; - enum PERMIN; - enum PERHOUR; - } - mandatory true; - description "Specifies how often location information is provided. - This parameter simply defines how often the customer is allowed to - request location information. This is not related to the time it - takes to determine the location, which is a characteristic of the - positioning method. - If leaf-list availability is empty, the value has no meaning."; - reference "NG.116"; - } - leaf accuracy { - type decimal64 { - fraction-digits 2; - } - units meter; - mandatory true; - description "Specifies the accuracy of the location information. - Accuracy depends on the respective positioning solution applied in the - RAN domain of the network slice."; - reference "NG.116"; - } - } - grouping RANSliceSubnetProfileGrp { description "Represents the RANSliceSubnetProfile datatype"; leaf latency { @@ -936,7 +890,7 @@ submodule _3gpp-ns-nrm-sliceprofile { description "Specifies whether the RAN domain of the network slice provides geo-localization methods or supporting methods."; reference "Clause 3.4.20 of NG.116 [50]."; - uses PositioningRANSubnetGrp; + uses PositioningGrp; } } -- GitLab From fce5e7f634cb13d2655921504abe9c462eba78c9 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Tue, 4 Feb 2025 09:31:41 +0100 Subject: [PATCH 02/94] Updated YANG models for compliance and corrections --- .../_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang | 1 + yang-models/_3gpp-5gc-nrm-nfservice.yang | 48 +++++++++-------- yang-models/_3gpp-common-yang-types.yang | 53 +++++++++++-------- .../_3gpp-nr-nrm-eutranfreqrelation.yang | 18 ++++--- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 7 +-- yang-models/_3gpp-nr-nrm-nrfreqrelation.yang | 18 +++---- yang-models/_3gpp-nr-nrm-nrfrequency.yang | 7 +-- .../_3gpp-ns-nrm-networkslicesubnet.yang | 7 +-- 8 files changed, 90 insertions(+), 69 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang b/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang index 82d33842e..0a1adaef4 100755 --- a/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang +++ b/yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang @@ -40,6 +40,7 @@ module _3gpp-5gc-nrm-FiveQiDscpMappingSet { grouping FiveQiDscpMappingSetGrp { description "Represents the FiveQiDscpMappingSet IOC."; list fiveQiDscpMappingList { + description "It provides the list of mapping between 5QIs and DSCP."; key "dscp"; uses FiveQiDscpMapping; } diff --git a/yang-models/_3gpp-5gc-nrm-nfservice.yang b/yang-models/_3gpp-5gc-nrm-nfservice.yang index d3d3a71cd..2577809c6 100755 --- a/yang-models/_3gpp-5gc-nrm-nfservice.yang +++ b/yang-models/_3gpp-5gc-nrm-nfservice.yang @@ -127,31 +127,34 @@ module _3gpp-5gc-nrm-nfservice { } leaf-list allowedNfDomains { - description "Pattern representing the NF domain names allowed to access the service instance."; + description "Pattern representing the NF domain names allowed to + access the service instance."; //optional support min-elements 1; type string; } list allowedNSSAI { - description "S-NSSAI of the allowed slices to access the service instance. - The absence of this attribute indicates that any slice is allowed to - access the service instance."; + description "S-NSSAI of the allowed slices to access the service + instance. The absence of this attribute indicates that any slice + is allowed to access the service instance."; min-elements 1; //optional support key "sd sst"; uses types5g3gpp:SNssai; } leaf-list allowedOperationsPerNfType { - description "It indicates the allowed operations on resources for each type - of NF; the key of the map is the NF Type, and the value is an array of scopes"; + description "It indicates the allowed operations on resources for + each type of NF; the key of the map is the NF Type, and the value + is an array of scopes"; //optional support type string; min-elements 1; } leaf-list allowedOperationsPerNfInstance { - description "It indicates the allowed operations on resources for a given NF - Instance; the key of the map is the NF Instance Id, and the value is an array of scopes"; + description "It indicates the allowed operations on resources for + a given NF Instance; the key of the map is the NF Instance Id, and + the value is an array of scopes"; //optional support type string; min-elements 1; @@ -159,26 +162,28 @@ module _3gpp-5gc-nrm-nfservice { leaf allowedOperationsPerNfInstanceOverrides { type boolean; default false; - description "When it is present and set to true, indicates that the scopes defined in - attribute allowedOperationsPerNfInstance for a given NF Instance ID take precedence over - the scopes defined in attribute allowedOperationsPerNfType for the corresponding NF type - of the NF Instance associated to such NF Instance ID.."; + description "When it is present and set to true, indicates that + the scopes defined in attribute allowedOperationsPerNfInstance + for a given NF Instance ID take precedence over the scopes defined + in attribute allowedOperationsPerNfType for the corresponding + NF type of the NF Instance associated to such NF Instance ID.."; } leaf-list oauth2Required { type boolean; max-elements 1; - description "It indicates whether the NF Service Instance requires Oauth2-based authorization"; + description "It indicates whether the NF Service Instance requires + Oauth2-based authorization"; } leaf-list sharedServiceDataId { type string; max-elements 1; - description "String uniquely identifying SharedServiceData. The format of the - sharedServiceDataId shall be a Universally Unique Identifier (UUID) version 4, - as described in IETF RFC 4122 [44]. The hexadecimal letters should be formatted - as lower-case characters by the sender, and they shall be handled as case-insensitive - by the receiver."; + description "String uniquely identifying SharedServiceData. The format + of the sharedServiceDataId shall be a Universally Unique Identifier + (UUID) version 4, as described in IETF RFC 4122 [44]. The hexadecimal + letters should be formatted as lower-case characters by the sender, + and they shall be handled as case-insensitive by the receiver."; } leaf priority { @@ -342,12 +347,13 @@ module _3gpp-5gc-nrm-nfservice { type string; } leaf mNC { - description "This is the Mobile Network Code (MNC) of the PLMN identifier. - See TS 23.003 [13] subclause 2.2 and 12.1."; + description "This is the Mobile Network Code (MNC) of the PLMN + identifier. See TS 23.003 [13] subclause 2.2 and 12.1."; type string; } leaf nId { - description "Network Identity; Shall be present if PlmnIdNid identifies an SNPN"; + description "Network Identity; Shall be present if PlmnIdNid + identifies an SNPN"; type string; } } diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 0195a23c3..de9ff55c9 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -731,9 +731,9 @@ module _3gpp-common-yang-types { grouping GeoAreaGrp { description "This data type defines a geographical area. The geo-area is defined using a convex polygon in the attribute - 'convexGeoPolygon'."; + 'geoPolygon'."; - list convexGeoPolygon { + list geoPolygon { description "Specifies the geographical area with a convex polygon. The convex polygon is specified by its corners."; key "latitude longitude"; @@ -871,7 +871,8 @@ module _3gpp-common-yang-types { leaf interPlmnCallbackUri { description "It indicates the callback URI to be used by NF Service - Producers located in PLMNs that are different from the PLMN of the NF consumer."; + Producers located in PLMNs that are different from the PLMN of + the NF consumer."; type inet:uri; } leaf n1MessageClass { @@ -889,44 +890,50 @@ module _3gpp-common-yang-types { type N2InformationClass; } leaf binding { - description "This attribute shall contain the value of the Binding Indication - for the default subscription notification "; - reference " i.e. the value part of 3gpp-Sbi-Binding header, as specified in + description "This attribute shall contain the value of the Binding + Indication for the default subscription notification "; + reference " i.e. the value part of 3gpp-Sbi-Binding header, as + specified in clause 6.12.4 of 3GPP TS 29.500 76. "; //optional type string; config false; } leaf acceptedEncoding { - description "It indicates the content encodings that are accepted by a NF Service - Consumer when receiving a notification related to a default notification subscription"; + description "It indicates the content encodings that are accepted by a + NF Service Consumer when receiving a notification related to a default + notification subscription"; reference "IETF RFC 9110 clause 12.5.3 "; //optional type string; config false; } leaf supportedFeatures { - description "It is a string, which indicates the features of the service corresponding - to the subscribed default notification, which are supported by the NF (Service) instance - acting as NF service consumer. The string shall contain a bitmask indicating supported - features in hexadecimal representation:Each character in the string shall take a value + description "It is a string, which indicates the features of the service + corresponding to the subscribed default notification, which are supported + by the NF (Service) instance acting as NF service consumer. The string + shall contain a bitmask indicating supported features in hexadecimal + representation:Each character in the string shall take a value of 0 to 9, a to f or A to F "; - reference "shall represent the support of 4 features as described in table 5.2.2-3 of TS 29.571 [61]."; + reference "shall represent the support of 4 features as described in + table 5.2.2-3 of TS 29.571 [61]."; //optional type string; config false; } leaf serviceInfoList { - description "It indicates a list of service specific information. It may be present - when the notification request of the notification type may be generated by multiple - services, i.e. notifications from different services may be received by the subscription."; + description "It indicates a list of service specific information. It may + be present when the notification request of the notification type may be + generated by multiple services, i.e. notifications from different + services may be received by the subscription."; //optional type string; config false; } leaf callbackUriPrefix { - description "It indicates the optional path segment(s) used to construct the prefix of the - Callback URIs during the reselection of an NF service consumer, as described in 3GPP TS 29.501"; + description "It indicates the optional path segment(s) used to construct + the prefix of the Callback URIs during the reselection of an NF service + consumer, as described in 3GPP TS 29.501"; //optional type inet:uri; } @@ -1104,9 +1111,9 @@ module _3gpp-common-yang-types { In addition, the MnS producer shall create on behalf of the MnS consumer a subscription, using 'NtfSubscriptionControl', for the notification types 'notifyMOICreation' and 'notifyMOIDeletion' related - to the 'File' instances that will be produced later. In case an existing - subscription does already include the 'File' instances to be produced, - no new subscription shall be created. The + to the 'File' instances that will be produced later. In case an + existing subscription does already include the 'File' instances to be + produced, no new subscription shall be created. The 'notificationRecipientAddress' attribute in the created 'NtfSubscriptionControl' instance shall be set to the value of the 'notificationRecipientAddress' in the related 'PerfMetricJob'. This @@ -1148,8 +1155,8 @@ module _3gpp-common-yang-types { leaf fileLocation { type string ; description "Applicable and must be present when the file-based - reporting method is supported, and the files are stored on the MnS - consumer."; + reporting method is supported, and the files are stored on the + MnS consumer."; } } case notification-target { diff --git a/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang b/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang index b5479dfd0..50ed647f5 100755 --- a/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang +++ b/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang @@ -11,18 +11,20 @@ module _3gpp-nr-nrm-eutranfreqrelation { import _3gpp-nr-nrm-nrcellcu { prefix nrcellcu3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the EUtranFreqRelation Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2025-01-25 { reference CR-; } + revision 2025-01-25 { reference CR-1442; } 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 { + revision 2019-06-17 {reference CR-; } description "Initial revision"; + } grouping EUtranFreqRelationGrp { @@ -42,16 +44,16 @@ module _3gpp-nr-nrm-eutranfreqrelation { leaf-list blockListEntry { description "A list of Physical Cell Identities (PCIs) that are - blocklisted in E-UTRAN measurements."; + blocklisted in E-UTRAN measurements."; reference "3GPP TS 38.331"; - min-elements 0; + //optional type uint16 { range "0..503"; } } leaf-list blockListEntryIdleMode { description "A list of Physical Cell Identities (PCIs) that are blocklisted in SIB4 and SIB5."; - min-elements 0; + //optional type uint16 { range "0..1007"; } } @@ -153,7 +155,6 @@ module _3gpp-nr-nrm-eutranfreqrelation { serving frequency. Each frequency of NR and E-UTRAN might have a specific threshold."; reference "ThreshX, LowQ in 3GPP TS 38.304"; - mandatory false; type int32 { range "0..31"; } units dB; } @@ -196,7 +197,10 @@ module _3gpp-nr-nrm-eutranfreqrelation { } } - augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/nrcellcu3gpp:NRCellCU { + augment + /me3gpp:ManagedElement + /gnbcucp3gpp:GNBCUCPFunction + /nrcellcu3gpp:NRCellCU { list EUtranFreqRelation { description "Represents a frequency relation between an NR cell and an diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 9b0452ac3..b7c05dddd 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -350,7 +350,8 @@ module _3gpp-nr-nrm-gnbcucpfunction { leaf gnbIdLength { type int32 {range "22..32";} mandatory true; - description "This indicates the number of bits for encoding the gNB ID. See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; + description "This indicates the number of bits for encoding the gNB ID. + See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; } leaf gnbId { @@ -367,8 +368,8 @@ module _3gpp-nr-nrm-gnbcucpfunction { uses types3gpp:PLMNId; leaf enbId { - description "It identifies an eNB within a PLMN. The eNB ID is part of the E-UTRAN Cell Global Identifier (ECGI) of the eNB - cells."; + description "It identifies an eNB within a PLMN. The eNB ID is part of + the E-UTRAN Cell Global Identifier (ECGI) of the eNB cells."; reference "eNB ID in 3GPP TS 36.300. Global eNB ID in 3GPP TS 36.413."; mandatory true; type int32 {range "0..4194303";} diff --git a/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang b/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang index 46b942353..d4b04ea70 100755 --- a/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang +++ b/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang @@ -10,19 +10,20 @@ module _3gpp-nr-nrm-nrfreqrelation { import _3gpp-nr-nrm-nrcellcu { prefix nrcellcu3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the NRFreqRelation Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2025-01-25 { reference CR-; } + revision 2025-01-25 { reference CR-1442; } 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 CR-0281; } revision 2019-10-28 { reference S5-193518; } - revision 2019-06-17 { + revision 2019-06-17 { reference S5-} description "Initial revision"; } @@ -81,14 +82,12 @@ module _3gpp-nr-nrm-nrfreqrelation { description "A list of Physical Cell Identities (PCIs) that are blocklisted in NR measurements."; reference "3GPP TS 38.331"; - min-elements 0; type uint16 { range "0..503"; } } leaf-list blockListEntryIdleMode { description "A list of Physical Cell Identities (PCIs) that are blocklisted in SIB4 and SIB5."; - min-elements 0; type uint16 { range "0..1007"; } } @@ -117,7 +116,6 @@ module _3gpp-nr-nrm-nrfreqrelation { description "Used for calculation of the parameter Pcompensation (defined in 3GPP TS 38.304), at cell reselection to a cell."; reference "PEMAX in 3GPP TS 38.101-1"; - mandatory false; type int32 { range "-30..33"; } units dBm; } @@ -125,7 +123,6 @@ module _3gpp-nr-nrm-nrfreqrelation { leaf qOffsetFreq { description "The frequency specific offset applied when evaluating candidates for cell reselection."; - mandatory false; type types3gpp:QOffsetRange; default 0; } @@ -204,7 +201,7 @@ module _3gpp-nr-nrm-nrfreqrelation { units s; } - leaf tReselectionNRSfHigh { + leaf tReselectionNRSfHigh { description "The attribute tReselectionNr (parameter TreselectionNR in 3GPP TS 38.304) is multiplied with this scaling factor if the UE is in high mobility state."; @@ -226,14 +223,17 @@ module _3gpp-nr-nrm-nrfreqrelation { units %; } - leaf nRFrequencyRef { + leaf nRFrequencyRef { description "Reference to a corresponding NRFrequency instance."; mandatory true; type types3gpp:DistinguishedName; } } - augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/nrcellcu3gpp:NRCellCU { + augment + /me3gpp:ManagedElement + /gnbcucp3gpp:GNBCUCPFunction + /nrcellcu3gpp:NRCellCU { list NRFreqRelation { description "Together with the target NRFrequency, it represents the diff --git a/yang-models/_3gpp-nr-nrm-nrfrequency.yang b/yang-models/_3gpp-nr-nrm-nrfrequency.yang index 1ae6f94fc..d3acc7a0f 100755 --- a/yang-models/_3gpp-nr-nrm-nrfrequency.yang +++ b/yang-models/_3gpp-nr-nrm-nrfrequency.yang @@ -1,6 +1,6 @@ module _3gpp-nr-nrm-nrfrequency { yang-version 1.1; - namespace "urn:3gpp:sa5:_3gpp-nr-nrm-nrnetwork-nrfrequency"; + namespace "urn:3gpp:sa5:_3gpp-nr-nrm-nrfrequency"; prefix "nrfreq3gpp"; import _3gpp-common-managed-function { prefix mf3gpp; } @@ -9,6 +9,7 @@ module _3gpp-nr-nrm-nrfrequency { import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the NRFrequency Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, @@ -18,7 +19,7 @@ module _3gpp-nr-nrm-nrfrequency { revision 2025-01-25 { reference CR-1442 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { + revision 2019-06-17 { reference S5-} description "Initial revision"; } @@ -45,7 +46,7 @@ module _3gpp-nr-nrm-nrfrequency { description "List of additional frequency bands the frequency belongs to. The list is automatically set by the gNB."; config false; - min-elements 0; + min-elements 1; type uint16 { range "1..256"; } } } diff --git a/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang b/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang index 7aba7f7e6..2491ec1c2 100755 --- a/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang +++ b/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang @@ -23,10 +23,10 @@ module _3gpp-ns-nrm-networkslicesubnet { Information model definitions for network slice NRM (chapter 6) "; - revision 2025-01-25 { reference CR-1412 ; } + revision 2025-01-25 { reference CR-1442 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-07-26 { reference CR-0770 ; } - revision 2021-05-05 { + revision 2021-05-05 { reference CR- } description "replace perfReq with 3 new datatypes xxxSliceSubnetProfile"; reference "CR-0485"; } @@ -56,7 +56,8 @@ module _3gpp-ns-nrm-networkslicesubnet { type string; } leaf connectionPointIdType { - description "This parameter specifies the type of the connection point identifier"; + description "This parameter specifies the type of the connection point + identifier"; type enumeration { enum VLAN; enum MPLS; -- GitLab From 1c25188be1d0b5c723fba7412c642ca70308d720 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Tue, 4 Feb 2025 09:50:55 +0100 Subject: [PATCH 03/94] Updated YANG models for compliance and corrections --- yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang | 11 ++++------- yang-models/_3gpp-nr-nrm-nrfreqrelation.yang | 8 +++----- yang-models/_3gpp-nr-nrm-nrfrequency.yang | 3 ++- yang-models/_3gpp-ns-nrm-networkslicesubnet.yang | 6 +++--- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang b/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang index 50ed647f5..6318de4ca 100755 --- a/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang +++ b/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang @@ -22,9 +22,9 @@ module _3gpp-nr-nrm-eutranfreqrelation { 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 {reference CR-; } + revision 2019-06-17 { + reference "Initial version"; description "Initial revision"; - } grouping EUtranFreqRelationGrp { @@ -196,11 +196,8 @@ module _3gpp-nr-nrm-eutranfreqrelation { type types3gpp:DistinguishedName; } } - - augment - /me3gpp:ManagedElement - /gnbcucp3gpp:GNBCUCPFunction - /nrcellcu3gpp:NRCellCU { + + augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/nrcellcu3gpp:NRCellCU { list EUtranFreqRelation { description "Represents a frequency relation between an NR cell and an diff --git a/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang b/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang index d4b04ea70..8ca1ce760 100755 --- a/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang +++ b/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang @@ -23,7 +23,8 @@ module _3gpp-nr-nrm-nrfreqrelation { revision 2023-04-26 { reference CR-0916; } revision 2020-04-23 { reference CR-0281; } revision 2019-10-28 { reference S5-193518; } - revision 2019-06-17 { reference S5-} + revision 2019-06-17 { + reference "Initial version"; description "Initial revision"; } @@ -230,10 +231,7 @@ module _3gpp-nr-nrm-nrfreqrelation { } } - augment - /me3gpp:ManagedElement - /gnbcucp3gpp:GNBCUCPFunction - /nrcellcu3gpp:NRCellCU { + augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/nrcellcu3gpp:NRCellCU { list NRFreqRelation { description "Together with the target NRFrequency, it represents the diff --git a/yang-models/_3gpp-nr-nrm-nrfrequency.yang b/yang-models/_3gpp-nr-nrm-nrfrequency.yang index d3acc7a0f..5564721df 100755 --- a/yang-models/_3gpp-nr-nrm-nrfrequency.yang +++ b/yang-models/_3gpp-nr-nrm-nrfrequency.yang @@ -19,7 +19,8 @@ module _3gpp-nr-nrm-nrfrequency { revision 2025-01-25 { reference CR-1442 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { reference S5-} + revision 2019-06-17 { + reference "Initial version"; description "Initial revision"; } diff --git a/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang b/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang index 2491ec1c2..8b31dd8ed 100755 --- a/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang +++ b/yang-models/_3gpp-ns-nrm-networkslicesubnet.yang @@ -26,10 +26,10 @@ module _3gpp-ns-nrm-networkslicesubnet { revision 2025-01-25 { reference CR-1442 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-07-26 { reference CR-0770 ; } - revision 2021-05-05 { reference CR- } - description "replace perfReq with 3 new datatypes xxxSliceSubnetProfile"; + revision 2021-05-05 { reference "CR-0485"; - } + description "replace perfReq with 3 new datatypes xxxSliceSubnetProfile"; + } revision 2020-02-19 { description "Introduction of YANG definitions for network slice NRM"; -- GitLab From 53fc99b33e5d940bb696bf5ef0c706218bec37df Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Tue, 4 Feb 2025 10:04:30 +0100 Subject: [PATCH 04/94] Updated YANG models for compliance and corrections --- yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang | 3 ++- yang-models/_3gpp-nr-nrm-nrfreqrelation.yang | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang b/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang index 6318de4ca..32e67873d 100755 --- a/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang +++ b/yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang @@ -197,7 +197,8 @@ module _3gpp-nr-nrm-eutranfreqrelation { } } - augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/nrcellcu3gpp:NRCellCU { + augment "/me3gpp:ManagedElement" + + "/gnbcucp3gpp:GNBCUCPFunction/nrcellcu3gpp:NRCellCU" { list EUtranFreqRelation { description "Represents a frequency relation between an NR cell and an diff --git a/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang b/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang index 8ca1ce760..f3f80a3d9 100755 --- a/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang +++ b/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang @@ -194,15 +194,15 @@ module _3gpp-nr-nrm-nrfreqrelation { units dB; } - leaf tReselectionNR { + leaf tReselectionNR { description "Cell reselection timer for NR."; reference "TreselectionRAT for NR in 3GPP TS 38.331"; mandatory true; type int32 { range "0..7"; } - units s; + units s; } - leaf tReselectionNRSfHigh { + leaf tReselectionNRSfHigh { description "The attribute tReselectionNr (parameter TreselectionNR in 3GPP TS 38.304) is multiplied with this scaling factor if the UE is in high mobility state."; @@ -231,7 +231,8 @@ module _3gpp-nr-nrm-nrfreqrelation { } } - augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/nrcellcu3gpp:NRCellCU { + augment "/me3gpp:ManagedElement" + + "/gnbcucp3gpp:GNBCUCPFunction/nrcellcu3gpp:NRCellCU" { list NRFreqRelation { description "Together with the target NRFrequency, it represents the -- GitLab From 802978ad7e3fb99a59826dad108bd98f7f553536 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 5 Feb 2025 15:15:44 +0100 Subject: [PATCH 05/94] yang extensions updated --- yang-models/_3gpp-common-yang-extensions.yang | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/yang-models/_3gpp-common-yang-extensions.yang b/yang-models/_3gpp-common-yang-extensions.yang index dc9c8e5b5..05ab00ea5 100755 --- a/yang-models/_3gpp-common-yang-extensions.yang +++ b/yang-models/_3gpp-common-yang-extensions.yang @@ -46,6 +46,7 @@ module _3gpp-common-yang-extensions { Solution Set (SS) definitions 3GPP TS 28.623"; + revision 2024-12-13 { reference "CR-0492" ; } revision 2024-04-05 { reference "CR-0332, 0333" ; } revision 2023-09-17 { reference "CR-0270, 0271" ; } revision 2022-10-31 { reference "CR-0195, 0196"; } @@ -65,7 +66,9 @@ module _3gpp-common-yang-extensions { Zero or one only-system-created statement per parent statement is allowed. No sub-statements are allowed. - Adding this statement is an NBC change, removing it is BC."; + Adding this statement is an NBC change, + removing it is BC, however if the system behavior is also changed in + parallel (the system stops creating the MOIs), this behavior is NBC."; } extension notNotifyable { @@ -73,14 +76,16 @@ module _3gpp-common-yang-extensions { "Indicates that data change notifications shall not be sent for this attribute. If the extension is not present and other conditions are fulfilled data change notification should be sent. + If a list or container already has the notNotifyable extension, that is also valid for all contained data nodes. The statement MUST only be a substatement of a leaf, leaf-list, list, container statement that is contained within the 'attributes' container of an IOC and that represents an attribute or sub-parts of - an attribute . - + an attribute. If the attribute is represented by a container or list, + the statement shall be put on these, not on data nodes inside the + list/container. Zero or one notNotifyable statement is allowed per parent statement. NO substatements are allowed. @@ -103,8 +108,12 @@ module _3gpp-common-yang-extensions { It is unnecessary to use and MUST NOT be used for key leafs. - The statement MUST only be a substatement of a leaf, leaf-list, list - statement that is config=true. + The statement MUST only be a substatement of a leaf, leaf-list, list, + container statement that is contained within the 'attributes' + container of an IOC and that represents an attribute or sub-parts of + an attribute and is config=true. If the attribute is represented by a + container or list, the statement shall be put on these, not on data + nodes inside the list/container. Zero or one inVariant statement is allowed per parent statement. NO substatements are allowed. -- GitLab From 1017cb80bfbd89bcd10e03a09efdaa27e2501315 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 5 Feb 2025 15:25:00 +0100 Subject: [PATCH 06/94] yang extension 2 --- yang-models/_3gpp-common-yang-extensions.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-yang-extensions.yang b/yang-models/_3gpp-common-yang-extensions.yang index 05ab00ea5..9fc38940c 100755 --- a/yang-models/_3gpp-common-yang-extensions.yang +++ b/yang-models/_3gpp-common-yang-extensions.yang @@ -38,7 +38,7 @@ module _3gpp-common-yang-extensions { If support for an extension is missing the extension statement needs individual handling or it SHOULD be removed from the module using the extension e.g. with a deviation. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -46,7 +46,7 @@ module _3gpp-common-yang-extensions { Solution Set (SS) definitions 3GPP TS 28.623"; - revision 2024-12-13 { reference "CR-0492" ; } + revision 2025-02-07 { reference "CR-0492" ; } revision 2024-04-05 { reference "CR-0332, 0333" ; } revision 2023-09-17 { reference "CR-0270, 0271" ; } revision 2022-10-31 { reference "CR-0195, 0196"; } -- GitLab From 015a896de5db730598858e1fac723564bbf684b9 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 6 Feb 2025 01:12:17 +0100 Subject: [PATCH 07/94] yang extension 3 common with r18 --- yang-models/_3gpp-common-yang-extensions.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-yang-extensions.yang b/yang-models/_3gpp-common-yang-extensions.yang index 9fc38940c..0b1c1ee27 100755 --- a/yang-models/_3gpp-common-yang-extensions.yang +++ b/yang-models/_3gpp-common-yang-extensions.yang @@ -46,7 +46,7 @@ module _3gpp-common-yang-extensions { Solution Set (SS) definitions 3GPP TS 28.623"; - revision 2025-02-07 { reference "CR-0492" ; } + revision 2025-01-12 { reference "CR-0507, 0492" ; } revision 2024-04-05 { reference "CR-0332, 0333" ; } revision 2023-09-17 { reference "CR-0270, 0271" ; } revision 2022-10-31 { reference "CR-0195, 0196"; } -- GitLab From 2df4ca022ef6b75189de6a7dcd9c2d28936c4207 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 6 Feb 2025 15:23:43 +0100 Subject: [PATCH 08/94] thresholdinfo in fm corrected --- yang-models/_3gpp-common-fm.yang | 44 ++------------------------------ 1 file changed, 2 insertions(+), 42 deletions(-) diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index 223ea0033..62ee4555e 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -7,6 +7,7 @@ module _3gpp-common-fm { import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } + import _3gpp-common-measurements { prefix meas3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -255,52 +256,11 @@ module _3gpp-common-fm { yext3gpp:notNotifyable; } - grouping ThresholdInfoGrp { - leaf measurementType { - type string; - mandatory true; - } - - leaf direction { - type enumeration { - enum INCREASING; - enum DECREASING; - } - mandatory true; - description " - If it is 'Increasing', the threshold crossing notification is - triggered when the measurement value equals or exceeds a - thresholdValue. - - If it is 'Decreasing', the threshold crossing notification is - triggered when the measurement value equals or below a - thresholdValue."; - } - - leaf thresholdLevel { - type string; - } - - leaf thresholdValue { - type string; - } - - leaf hysteresis { - type string; - description "The hysteresis has a threshold high and a threshold - low value that are different from the threshold value. - A hysteresis, therefore, defines the threshold-high and - threshold-low levels within which the measurementType value is - allowed to oscillate without triggering the threshold crossing - notification."; - } - } - list thresholdInfo { config false ; yext3gpp:notNotifyable; description "Indicates the crossed threshold"; - uses ThresholdInfoGrp; + uses meas3gpp:ThresholdInfoGrp; } list stateChangeDefinition { -- GitLab From 0de183f70f2997b9ecbdca28c36326ad43963f4c Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Thu, 6 Feb 2025 16:17:33 +0100 Subject: [PATCH 09/94] Corrrect NpnId defintions for _3gpp-common-trace.yang _3gpp-common-yang-types.yang_3gpp-nr-nrm-nrcelldu.yang --- yang-models/_3gpp-common-trace.yang | 32 +++--------------- yang-models/_3gpp-common-yang-types.yang | 42 ++++++++++-------------- yang-models/_3gpp-nr-nrm-nrcelldu.yang | 3 +- 3 files changed, 24 insertions(+), 53 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 3c0f3401b..8894d92f3 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -26,6 +26,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; + revision 2024-11-25 { reference CR-0942; } revision 2024-11-07 { reference "CR-0480"; } revision 2024-10-01 { reference "CR-0457"; } revision 2024-08-13 { reference "CR-0387 CR-0377"; } @@ -158,36 +159,11 @@ module _3gpp-common-trace { identified by Network ID with associated plmn-Identity"; key idx; min-elements 1; - uses NpnIdGrp; + uses types3gpp:NpnIdGrp; leaf idx { type string; } } } - grouping NpnIdGrp { - description "Represents the NpnId dataType."; - - list plmnId { - key "mcc mnc"; - description "It specifies the PLMN Id of the NPN network."; - uses types3gpp:PLMNId; - max-elements 1; - } - - list cAGIdList { - key idx; - max-elements 256; - description "It specifies the PNI-NPN identified by CAG ID "; - leaf idx { type string; } - } - - list nIDList { - key idx; - max-elements 16; - description "It specifies the SNPN identified by Network ID"; - leaf idx { type string; } - } - } - grouping ExcessPacketDelayThresholdsGrp { description "Represents the ExcessPacketDelayThresholds dataType. This <> defines a excess packet delay threshold information @@ -1430,7 +1406,7 @@ module _3gpp-common-trace { corresponding PNI-NPN or SNPN."; key idx; max-elements 1; - uses NpnIdGrp; + uses types3gpp:NpnIdGrp; leaf idx { type string;} } } @@ -1798,7 +1774,7 @@ module _3gpp-common-trace { several NPNs are supported in the RAN."; key idx; max-elements 1; - uses NpnIdGrp; + uses types3gpp:NpnIdGrp; leaf idx { type string;} } } diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index de9ff55c9..f316abd34 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-11-25 { reference CR-0942; } revision 2024-11-25 { reference CR-1442; } revision 2024-11-25 { reference CR-1412; } revision 2024-11-01 { reference CR-0463; } @@ -301,42 +302,35 @@ module _3gpp-common-yang-types { yext3gpp:notNotifyable; } } - grouping NPNIdGrp { + grouping NpnIdGrp { description "Represents the NPN supported by the <> using this <> as one of its attributes in case of the cell is a NPN-only cell."; - list plmnid { + list plmnId { key "mcc mnc"; min-elements 1; - description "PLMNId"; + description "It specifies the PLMN Id of the NPN network."; uses types3gpp:PLMNId; } - leaf cAGIdList { - type string; - mandatory true; + list cAGIdList { + key idx; + max-elements 256; description "It identifies a CAG list containing up to 12 CAG-identifiers - per PLMN Identity, see TS 38.331. - - CAG is used for the PNI-NPNs to prevent UE(s), which are not allowed - to access the NPN via the associated cell(s), from automatically - selecting and accessing the associated CAG cell(s). - - CAG ID is used to combine with PLMN ID to identify a PNI-NPN. - - Exist if the cell is a NPN-only cell see TS 38.331"; + per Ue or up to 12 CAG-identifiers per cell, see TS 38.331 [38]. + CAG ID is used to combine with PLMN ID to identify a PNI-NPN.CAG ID is + a hexadecimal range with size 32 bit"; + leaf idx { type string; } } - leaf nIDList { - type string; - mandatory true; - description "It identifies a list of NIDs containing up to 12 NIDs per - PLMN Identity, see TS 38.331. - - NID is used to combine with PLMN ID to identify an SNPN. - - Exist if the cell is a NPN-only cell see TS 38.331"; + list nIDList { + key idx; + max-elements 16; + description "It identifies a list of NIDs containing up to 16 NIDs, see + TS 38.331 [38].NID is used to combine with PLMN ID to identify an SNPN. + NID is a hexadecimal range with size 44 bit."; + leaf idx { type string; } } } diff --git a/yang-models/_3gpp-nr-nrm-nrcelldu.yang b/yang-models/_3gpp-nr-nrm-nrcelldu.yang index 94420e4df..8db5164c4 100755 --- a/yang-models/_3gpp-nr-nrm-nrcelldu.yang +++ b/yang-models/_3gpp-nr-nrm-nrcelldu.yang @@ -19,6 +19,7 @@ module _3gpp-nr-nrm-nrcelldu { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-11-25 { reference CR-0942; } revision 2024-05-25 { reference CR-1412 ; } revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } @@ -105,7 +106,7 @@ module _3gpp-nr-nrm-nrcelldu { corresponding PNI-NPN or SNPN in case of the cell is NPN-only cell."; reference "3GPP TS 38.331"; leaf idx { type uint32 ; } - uses types3gpp:NPNIdGrp; + uses types3gpp:NpnIdGrp; } leaf nRPCI { -- GitLab From 8ed5cb9fb45393984722212fa732876c63a3fd4f Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Thu, 6 Feb 2025 16:23:13 +0100 Subject: [PATCH 10/94] Corrrect min-elements 0 --- yang-models/_3gpp-common-trace.yang | 1 - 1 file changed, 1 deletion(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 8894d92f3..d4ce40c13 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -1440,7 +1440,6 @@ module _3gpp-common-trace { key "idx"; leaf idx { type uint32 ; } description "It specifies the area where data shall be collected. "; - min-elements 0; max-elements 1; uses AreaScopeGrp; } -- GitLab From 07059e719879118c83fa6a2f5af63b3d0d18d520 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 6 Feb 2025 18:47:11 +0100 Subject: [PATCH 11/94] added CRno to fm --- yang-models/_3gpp-common-fm.yang | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index 62ee4555e..da5d3eaee 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -13,12 +13,14 @@ module _3gpp-common-fm { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines a Fault Management model - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.111"; + revision 2025-02-07 { reference CR-0022 ; } revision 2024-05-12 { - description "The definition of the module was from TS 28.623 to TS 28.111"; + description "The definition of the module was moved from TS 28.623 to + TS 28.111"; reference CR-0008 ; } revision 2024-03-06 { reference CR-0333 ; } -- GitLab From df48e356f843187d97f4474bfe556f3b8e5ec0ef Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Fri, 7 Feb 2025 17:32:12 +0100 Subject: [PATCH 12/94] correcting crno+copyrigt --- yang-models/_3gpp-common-trace.yang | 4 ++-- yang-models/_3gpp-common-yang-types.yang | 2 +- yang-models/_3gpp-nr-nrm-nrcelldu.yang | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index d4ce40c13..9b505b336 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -14,7 +14,7 @@ module _3gpp-common-trace { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Trace handling - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -26,7 +26,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; - revision 2024-11-25 { reference CR-0942; } + revision 2024-11-25 { reference CR-0492; } revision 2024-11-07 { reference "CR-0480"; } revision 2024-10-01 { reference "CR-0457"; } revision 2024-08-13 { reference "CR-0387 CR-0377"; } diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index f316abd34..7b2c50ed8 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -16,7 +16,7 @@ module _3gpp-common-yang-types { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623"; - revision 2024-11-25 { reference CR-0942; } + revision 2025-02-07 { reference CR-0492; } revision 2024-11-25 { reference CR-1442; } revision 2024-11-25 { reference CR-1412; } revision 2024-11-01 { reference CR-0463; } diff --git a/yang-models/_3gpp-nr-nrm-nrcelldu.yang b/yang-models/_3gpp-nr-nrm-nrcelldu.yang index 8db5164c4..392b11cd2 100755 --- a/yang-models/_3gpp-nr-nrm-nrcelldu.yang +++ b/yang-models/_3gpp-nr-nrm-nrcelldu.yang @@ -19,7 +19,7 @@ module _3gpp-nr-nrm-nrcelldu { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2024-11-25 { reference CR-0942; } + revision 2025-02-07 { reference CR-1442; } revision 2024-05-25 { reference CR-1412 ; } revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } -- GitLab From c1f9fe62978a88a0089a41fc5ed2b5e18ff2808d Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 10 Feb 2025 12:18:32 +0100 Subject: [PATCH 13/94] npnidgrp correction --- yang-models/_3gpp-common-yang-types.yang | 38 +++++++++++++----------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 7b2c50ed8..cfbcd7890 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -302,7 +302,8 @@ module _3gpp-common-yang-types { yext3gpp:notNotifyable; } } - grouping NpnIdGrp { + + grouping NpnIdGrp { description "Represents the NPN supported by the <> using this <> as one of its attributes in case of the cell is a NPN-only cell."; @@ -314,23 +315,24 @@ module _3gpp-common-yang-types { uses types3gpp:PLMNId; } - list cAGIdList { - key idx; - max-elements 256; - description "It identifies a CAG list containing up to 12 CAG-identifiers - per Ue or up to 12 CAG-identifiers per cell, see TS 38.331 [38]. - CAG ID is used to combine with PLMN ID to identify a PNI-NPN.CAG ID is - a hexadecimal range with size 32 bit"; - leaf idx { type string; } - } - - list nIDList { - key idx; - max-elements 16; - description "It identifies a list of NIDs containing up to 16 NIDs, see - TS 38.331 [38].NID is used to combine with PLMN ID to identify an SNPN. - NID is a hexadecimal range with size 44 bit."; - leaf idx { type string; } + choice npnidChoice { + leaf-list cAGIdList { + type string; + max-elements 256; + description "It identifies a CAG list containing up to 12 + CAG-identifiers per Ue or up to 12 CAG-identifiers per cell, + see TS 38.331. + CAG ID is used to combine with PLMN ID to identify a PNI-NPN.CAG ID is + a hexadecimal range with size 32 bit"; + } + + leaf-list nIDList { + type string; + max-elements 16; + description "It identifies a list of NIDs containing up to 16 NIDs, see + TS 38.331. NID is used to combine with PLMN ID to identify an SNPN. + NID is a hexadecimal range with size 44 bit."; + } } } -- GitLab From e965df00cd5c395560edbaaf54e6c81ebbc9f5da Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Tue, 25 Mar 2025 23:38:12 +0100 Subject: [PATCH 14/94] removed invariant from attribute comments --- yang-models/_3gpp-common-fm.yang | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index da5d3eaee..4ffc893ce 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -17,6 +17,7 @@ module _3gpp-common-fm { TTA, TTC). All rights reserved."; reference "3GPP TS 28.111"; + revision 2025-03-25 { reference CR-0026; } revision 2025-02-07 { reference CR-0022 ; } revision 2024-05-12 { description "The definition of the module was moved from TS 28.623 to @@ -106,12 +107,14 @@ module _3gpp-common-fm { type yang:date-and-time; config false; mandatory true; + yext3gpp:inVariant; description "Date and Time the comment was created."; } leaf commentUserId { type string; mandatory true; + yext3gpp:inVariant; description "It carries the identification of the user who made the comment."; } @@ -119,6 +122,7 @@ module _3gpp-common-fm { leaf commentSystemId { type string; mandatory true; + yext3gpp:inVariant; description "It carries the identification of the system ( Management System) from which the comment is made. That system supports the user that made the comment."; @@ -127,6 +131,7 @@ module _3gpp-common-fm { leaf commentText { type string; mandatory true; + yext3gpp:inVariant; description "It carries the textual comment."; } } @@ -344,7 +349,6 @@ module _3gpp-common-fm { } list comments { - yext3gpp:inVariant; yext3gpp:notNotifyable; description "List of comments and data about the comments."; key idx; -- GitLab From 3d87e46c59f9bc544088dd812afb96c3b5443911 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 26 Mar 2025 00:06:11 +0100 Subject: [PATCH 15/94] corrected spelling of MeContext --- yang-models/_3gpp-common-mecontext.yang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-mecontext.yang b/yang-models/_3gpp-common-mecontext.yang index ed183f1a7..b1a261872 100644 --- a/yang-models/_3gpp-common-mecontext.yang +++ b/yang-models/_3gpp-common-mecontext.yang @@ -24,6 +24,7 @@ module _3gpp-common-mecontext { Integration Reference Point (IRP); Information Service (IS)"; + revision 2025-03-24 { reference "CR-0517 CR-0382 CR-0516"; } revision 2024-07-17 { reference "CR-0381 CR-0382 CR-0383"; } grouping MeContextGrp { @@ -39,7 +40,7 @@ module _3gpp-common-mecontext { } augment "/subnet3gpp:SubNetwork" { - list Mecontext { + 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. -- GitLab From 664a6d008d9bc5e740455a63bad1392e26e7691d Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 26 Mar 2025 02:27:09 +0100 Subject: [PATCH 16/94] corrected containment of dynamic5qiset --- yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang | 36 +++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang index 12ef3c65c..cf9383462 100755 --- a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang @@ -6,6 +6,9 @@ module _3gpp-5gc-nrm-dynamic5qiset { import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbdufunction { prefix gnbdu3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } + import _3gpp-nr-nrm-gnbcuupfunction { prefix gnbcuup3gpp; } import _3gpp-5gc-nrm-configurable5qiset { prefix Conf5QIs3gpp; } organization "3gpp SA5"; @@ -16,6 +19,7 @@ module _3gpp-5gc-nrm-dynamic5qiset { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-03-25 { reference CR-1489 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-07-28 { reference "CR-0770"; } revision 2022-01-07 { reference CR-0643; } @@ -52,11 +56,41 @@ module _3gpp-5gc-nrm-dynamic5qiset { } } - augment "/subnet3gpp:SubNetwork" { + feature Dynamic5QISetUnderSubNetwork { + description "Dynamic5QISet shall be contained under SubNetwork."; + } + augment "/subnet3gpp:SubNetwork" { + if-feature Dynamic5QISetUnderSubNetwork; uses Dynamic5QISetSubtree; } + feature Dynamic5QISetUnderManagedElement { + description "Dynamic5QISet shall be contained under ManagedElement."; + } augment "/me3gpp:ManagedElement" { + if-feature Dynamic5QISetUnderManagedElement; + uses Dynamic5QISetSubtree; + } + + feature Dynamic5QISetUnderGNBDUFunction { + description "Dynamic5QISet shall be contained under GNBDUFunction."; + } + augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" { + if-feature Dynamic5QISetUnderGNBDUFunction; + uses Dynamic5QISetSubtree; + } + + feature Dynamic5QISetUnderGNBCUCPFunction { + description "Dynamic5QISet shall be contained under GNBCUCPFunction."; + } + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction" { + uses Dynamic5QISetSubtree; + } + + feature Dynamic5QISetUnderGNBCUUPFunction { + description "Dynamic5QISet shall be contained under GNBCUUPFunction."; + } + augment "/me3gpp:ManagedElement/gnbcuup3gpp:GNBCUUPFunction" { uses Dynamic5QISetSubtree; } } \ No newline at end of file -- GitLab From ee24573dfadd30d295e9d6695abd5e13731c90d1 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 27 Mar 2025 20:28:56 +0100 Subject: [PATCH 17/94] added invariant to dnprefix --- yang-models/_3gpp-common-managed-element.yang | 4 +++- yang-models/_3gpp-common-mecontext.yang | 3 +++ yang-models/_3gpp-common-subnetwork.yang | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index d8ab19d68..785522ae4 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -4,6 +4,7 @@ module _3gpp-common-managed-element { prefix "me3gpp"; import _3gpp-common-yang-types { prefix types3gpp ; } + import _3gpp-common-yang-extensions { prefix yext3gpp ; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-measurements { prefix meas3gpp; } import _3gpp-common-subscription-control { prefix subscr3gpp; } @@ -35,7 +36,7 @@ module _3gpp-common-managed-element { 3GPP TS 28.620 Umbrella Information Model (UIM)"; - revision 2024-11-19 { reference "Add STM"; } + revision 2025-03-25 { reference "CR-0516"; } revision 2024-10-01 { reference "CR-0437,CR-0438" ; } revision 2024-01-30 { reference CR-0328 ; } revision 2023-11-14 { reference CR-0305 ; } @@ -147,6 +148,7 @@ module _3gpp-common-managed-element { A Distingushed Name(DN) is defined by 3GPP TS 32.300, which splits the DN into a DN Prefix and Local DN"; type types3gpp:DistinguishedName; + yext3gpp:inVariant; } leaf userLabel { diff --git a/yang-models/_3gpp-common-mecontext.yang b/yang-models/_3gpp-common-mecontext.yang index b1a261872..5b6b0c0ad 100644 --- a/yang-models/_3gpp-common-mecontext.yang +++ b/yang-models/_3gpp-common-mecontext.yang @@ -4,6 +4,7 @@ module _3gpp-common-mecontext { prefix "mectx3gpp"; import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-yang-extensions { prefix yext3gpp ; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import ietf-yang-schema-mount { prefix yangmnt; } @@ -24,6 +25,7 @@ module _3gpp-common-mecontext { Integration Reference Point (IRP); Information Service (IS)"; + revision 2025-03-25 { reference "CR-0516"; } revision 2025-03-24 { reference "CR-0517 CR-0382 CR-0516"; } revision 2024-07-17 { reference "CR-0381 CR-0382 CR-0383"; } @@ -32,6 +34,7 @@ module _3gpp-common-mecontext { leaf dnPrefix { type types3gpp:DistinguishedName; + yext3gpp:inVariant; 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."; diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang index 59868e1c6..e4fafa21f 100755 --- a/yang-models/_3gpp-common-subnetwork.yang +++ b/yang-models/_3gpp-common-subnetwork.yang @@ -4,6 +4,7 @@ module _3gpp-common-subnetwork { prefix "subnet3gpp"; import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-yang-extensions { prefix yext3gpp ; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-measurements { prefix meas3gpp; } import _3gpp-common-subscription-control { prefix subscr3gpp; } @@ -35,6 +36,7 @@ module _3gpp-common-subnetwork { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2025-03-25 { reference "CR-0516"; } revision 2024-11-19 { reference "Add STM"; } revision 2024-01-30 { reference CR-1337 ; } revision 2024-01-30 { reference CR-0328 ; } @@ -158,6 +160,7 @@ module _3gpp-common-subnetwork { leaf dnPrefix { type types3gpp:DistinguishedName; + yext3gpp:inVariant; reference "Annex C of 32.300 "; } -- GitLab From 5193c6717b558d6695d58526b2f375893cf2fe2e Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 27 Mar 2025 20:35:54 +0100 Subject: [PATCH 18/94] corrected if-feature --- yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang | 2 ++ 1 file changed, 2 insertions(+) diff --git a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang index cf9383462..c14d427de 100755 --- a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang @@ -84,6 +84,7 @@ module _3gpp-5gc-nrm-dynamic5qiset { description "Dynamic5QISet shall be contained under GNBCUCPFunction."; } augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction" { + if-feature Dynamic5QISetUnderGNBCUCPFunction; uses Dynamic5QISetSubtree; } @@ -91,6 +92,7 @@ module _3gpp-5gc-nrm-dynamic5qiset { description "Dynamic5QISet shall be contained under GNBCUUPFunction."; } augment "/me3gpp:ManagedElement/gnbcuup3gpp:GNBCUUPFunction" { + if-feature Dynamic5QISetUnderGNBCUUPFunction; uses Dynamic5QISetSubtree; } } \ No newline at end of file -- GitLab From 167be630c354913209b28c4b3b124142fcaca8da Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Thu, 27 Mar 2025 22:50:20 +0100 Subject: [PATCH 19/94] Add and update NFProfile-related YANG models including HssInfoGrp, GmlcFunction, and other fixes foryang validation --- yang-models/_3gpp-5g-common-yang-types.yang | 45 +++ yang-models/_3gpp-5gc-nrm-amffunction.yang | 7 +- yang-models/_3gpp-5gc-nrm-gmlcfunction.yang | 114 ++++++ yang-models/_3gpp-5gc-nrm-lmffunction.yang | 6 +- yang-models/_3gpp-5gc-nrm-neffunction.yang | 6 +- yang-models/_3gpp-5gc-nrm-nfprofile.yang | 353 +++++++++++++++--- yang-models/_3gpp-5gc-nrm-nwdaffunction.yang | 4 +- .../_3gpp-5gc-nrm-predefinedpccruleset.yang | 1 + 8 files changed, 466 insertions(+), 70 deletions(-) create mode 100644 yang-models/_3gpp-5gc-nrm-gmlcfunction.yang diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang index 421940541..9ecc12b82 100755 --- a/yang-models/_3gpp-5g-common-yang-types.yang +++ b/yang-models/_3gpp-5g-common-yang-types.yang @@ -14,6 +14,7 @@ module _3gpp-5g-common-yang-types { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-03-25 { reference CR-1489 ; } revision 2024-11-01 { reference CR-1405; } revision 2024-10-06 { reference CR-1389; } revision 2024-05-24 { reference CR-1273 ; } @@ -192,6 +193,50 @@ module _3gpp-5g-common-yang-types { type string; } } + grouping TaiRangeGrp { + list plmnId { + description "PLMN ID related to the TacRange."; + min-elements 1; + max-elements 1; + key "mcc mnc"; + uses types3gpp:PLMNId; + } + + list tacRangeList { + description "The range of the TACs."; + min-elements 1; + key "start end"; + uses TacRange; + } + } + + grouping TacRange { + leaf start { + description "First value identifying the start of a TAC range, + to be used when the range of TAC's can be represented + as a hexadecimal range (e.g., TAC ranges)."; + type string { + pattern '^([A-Fa-f0-9]{4}|[A-Fa-f0-9]{6}$)'; + } + } + + leaf end { + description "Last value identifying the end of a TAC range, + to be used when the range of TAC's can be represented as + a hexadecimal range (e.g. TAC ranges)."; + type string { + pattern '^([A-Fa-f0-9]{4}|[A-Fa-f0-9]{6})$'; + } + } + + leaf nRTACpattern { + description "Pattern (regular expression according to the ECMA-262) + representing the set of TAC's belonging to this range. + A TAC value is considered part of the range if and only if the + TAC string fully matches the regular expression."; + type string; + } + } grouping SupportedFunc { leaf function { diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index cf6b290f2..c810e811d 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -10,7 +10,7 @@ module _3gpp-5gc-nrm-amffunction { import ietf-inet-types { prefix inet; } import ietf-yang-types { prefix yang; } 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"; @@ -18,7 +18,8 @@ module _3gpp-5gc-nrm-amffunction { 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 2025-03-25 { reference CR-1489 ; } revision 2024-11-01 { reference CR-1405; } revision 2024-10-06 { reference CR-1389; } revision 2024-04-04 { reference CR-1139; } @@ -392,7 +393,7 @@ module _3gpp-5gc-nrm-amffunction { description "The range of TAIs."; key "idx"; leaf idx { type uint32 ; } - uses nfp3gpp:TaiRangeGrp; + uses types5g3gpp:TaiRangeGrp; } list gUAMIdList { diff --git a/yang-models/_3gpp-5gc-nrm-gmlcfunction.yang b/yang-models/_3gpp-5gc-nrm-gmlcfunction.yang new file mode 100644 index 000000000..689f35673 --- /dev/null +++ b/yang-models/_3gpp-5gc-nrm-gmlcfunction.yang @@ -0,0 +1,114 @@ +module _3gpp-5gc-nrm-gmlcfunction { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-5gc-nrm-gmlcfunction"; + prefix gmlc3gpp; + + import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-5g-common-yang-types { prefix types5g3gpp; } + import _3gpp-common-top { prefix top3gpp; } + + organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "This module defines the GMLC Function IOC per 3GPP TS 28.541. + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved.";"; + reference "3GPP TS 28.541"; + + revision 2025-03-25 { reference CR-1489 ; } + revision 2025-03-25 { + description "Initial revision."; + reference "3GPP TS 28.541"; + } + + grouping GmlcInfoGrp { + description "Information of a GMLC NF Instance (see TS 29.510, clause 6.1.6.2.41)."; + + leaf servingClientTypes { + description "Identity of the GMLC group that is served by the GMLC instance."; + type enumeration { + enum EMERGENCY_SERVICES { + description "External client for emergency services"; + } + enum VALUE_ADDED_SERVICES { + description "External client for value added services"; + } + enum PLMN_OPERATOR_SERVICES { + description "External client for PLMN operator services"; + } + enum LAWFUL_INTERCEPT_SERVICES { + description "External client for Lawful Intercept services"; + } + enum EXTERNAL_CLIENT_FOR_LAWFUL_INTERCEPT_SERVICES { + description "External client for PLMN Operator Broadcast services"; + } + enum PLMN_OPERATOR_OM { + description "External client for PLMN Operator O&M"; + } + enum PLMN_OPERATOR_ANONYMOUS_STATISTICS { + description "External client for PLMN Operator anonymous statistics"; + } + enum PLMN_OPERATOR_TARGET_MS_SERVICE_SUPPORT { + description "External client for PLMN Operator target MS service support"; + } + } + + } + leaf gmlcNumbers{ + type string{ + pattern "^[0-9]{5,15}$"; + } + description "This attribute represents each item of the array + shall carry an OctetString indicating the ISDN number of the GMLC in + international number format as described in ITU-T Rec. E.164 [94] and + shall be encoded as a TBCD-string."; + + } + } + + grouping GMLCFunctionGrp { + description "GMLC Function IOC grouping."; + uses mf3gpp:ManagedFunctionGrp; + + list pLMNInfoList { + key "idx"; + leaf idx { type uint32; } + min-elements 1; + uses types3gpp:PLMNId; + uses types5g3gpp:SNssai; + } + leaf sBIFqdn { + type string; + description "FQDN of the registered NF instance in the service-based interface."; + } + list managedNFProfile { + description "This parameter defines profile for managed NF. See TS 23.501"; + key idx; + min-elements 1; + uses types3gpp:ManagedNFProfile; + } + list commModelList { + key "groupId"; + min-elements 1; + uses types5g3gpp:CommModel; + } + list gmlcInfo { + key "idx"; + leaf idx { type uint32; } + max-elements 1; + uses GmlcInfoGrp; + } + } + augment "/me3gpp:ManagedElement" { + list GMLCFunction { + description "5G Core LMF Function defined in TS 23.501"; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses GMLCFunctionGrp; + } + uses mf3gpp:ManagedFunctionContainedClasses; + } + } +} \ No newline at end of file diff --git a/yang-models/_3gpp-5gc-nrm-lmffunction.yang b/yang-models/_3gpp-5gc-nrm-lmffunction.yang index 2a612372f..af59f9fab 100755 --- a/yang-models/_3gpp-5gc-nrm-lmffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-lmffunction.yang @@ -9,7 +9,6 @@ module _3gpp-5gc-nrm-lmffunction { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-common-top { prefix top3gpp; } - import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; } import _3gpp-nr-nrm-ntnfunction { prefix ntn3gpp; } organization "3gpp SA5"; @@ -18,7 +17,8 @@ module _3gpp-5gc-nrm-lmffunction { Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - + + revision 2025-03-25 { reference CR-1489 ; } revision 2024-11-01 { reference CR-1405 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-25 { reference "S5-194457 S5193518"; } @@ -125,7 +125,7 @@ module _3gpp-5gc-nrm-lmffunction { min-elements 1; key idx; leaf idx { type uint32; } - uses nfp3gpp:TaiRangeGrp; + uses types5g3gpp:TaiRangeGrp; } leaf-list supportedGADShapes { diff --git a/yang-models/_3gpp-5gc-nrm-neffunction.yang b/yang-models/_3gpp-5gc-nrm-neffunction.yang index 1c48c30c8..8e1a8a514 100755 --- a/yang-models/_3gpp-5gc-nrm-neffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-neffunction.yang @@ -20,13 +20,13 @@ module _3gpp-5gc-nrm-neffunction { Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - + revision 2025-03-25 { reference CR-1489 ; } revision 2025-01-25 { reference CR-1442 ; } revision 2024-05-18 { reference CR-1273 ; } 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; } + revision 2023-04-26 { reference CR-0916 ; } revision 2022-01-07 { reference CR-0643; } revision 2020-11-06 { reference CR-0412 ; } revision 2019-10-20 { reference "initial revision"; } @@ -164,7 +164,7 @@ module _3gpp-5gc-nrm-neffunction { yext3gpp:notNotifyable; key idx; leaf idx { type uint32 ; } - uses nfp3gpp:TaiRangeGrp; + uses types5g3gpp:TaiRangeGrp; } leaf nefId { diff --git a/yang-models/_3gpp-5gc-nrm-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-nfprofile.yang index 35ed626ff..696f47231 100755 --- a/yang-models/_3gpp-5gc-nrm-nfprofile.yang +++ b/yang-models/_3gpp-5gc-nrm-nfprofile.yang @@ -8,7 +8,11 @@ module _3gpp-5gc-nrm-nfprofile { import ietf-inet-types { prefix inet; } import ietf-yang-types { prefix yang; } import _3gpp-5gc-nrm-nfservice { prefix nfs3gpp; } - + import _3gpp-5g-common-yang-types { prefix types5g3gpp; } + import _3gpp-5gc-nrm-nwdaffunction { prefix nwdaf3gpp; } + import _3gpp-5gc-nrm-lmffunction {prefix lmf3gpp; } + import _3gpp-5gc-nrm-gmlcfunction {prefix gmlc3gpp; } + organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "NF profile class. @@ -16,6 +20,7 @@ module _3gpp-5gc-nrm-nfprofile { TTA, TTC). All rights reserved."; reference "3GPP TS 29.510"; + revision 2025-03-25 { reference CR-1489 ; } revision 2025-01-25 { reference CR-1442 ; } revision 2024-04-12 { reference CR-1218 ; } revision 2023-11-18 { reference CR-1103 ; } @@ -340,7 +345,7 @@ module _3gpp-5gc-nrm-nfprofile { min-elements 1; key idx; leaf idx { type uint32; } - uses TaiRangeGrp; + uses types5g3gpp:TaiRangeGrp; } list backupInfoAmfFailure { @@ -411,7 +416,7 @@ module _3gpp-5gc-nrm-nfprofile { min-elements 1; key idx; leaf idx { type uint32; } - uses TaiRangeGrp; + uses types5g3gpp:TaiRangeGrp; } leaf pgwFqdn { @@ -580,7 +585,140 @@ module _3gpp-5gc-nrm-nfprofile { uses types3gpp:PLMNId; } } - + grouping pcscfInfo { + description "This data type represents the information of a P-CSCF NF Instance. + For more information, see clause 6.1.6.2.53 of TS 29.510."; + + leaf-list accessType { + description "It provides the condition of access type of the UE when + the session AMBR shall be enforced, see TS 29.512 [60].If this + attribute is included in SmfInfo, it shall contain the access type + (3GPP_ACCESS and/or NON_3GPP_ACCESS) supported by the SMF.If not + included, it shall be assumed the both access types are supported."; + type enumeration { + enum 3GPP_ACCESS; + enum NON_3GPP_ACCESS; + } + min-elements 1; + max-elements 2; + } + leaf-list dnnList { + description "It represents the DNNs supported by the PCF. The DNN, + as defined in clause 9A of TS 23.003 [13], shall contain the Network + Identifier and it may additionally contain an Operator Identifier, + as specified in TS 23.003 [13] clause 9.1.1 and 9.1.2. If the Operator + Identifier is not included, the DNN is supported for all the PLMNs in + the plmnList of the NF Profile.If not provided, the PCF can serve any + DNN."; + min-elements 1; + type string; + } + leaf-list gmFqdn { + description "This attribute represents FQDN of the P-CSCF for the Gm + interface.."; + max-elements 1; + type string; + } + leaf-list gmIpv4Addresses { + description "This attribute represents list of IPv4 addresses of of + the P-CSCF for the Gm interface."; + type inet:ipv4-address; + } + leaf-list gmIpv6Addresses { + description "This attribute represents list of IPv6 addresses of of the + P-CSCF for the Gm interface."; + type inet:ipv6-address; + } + leaf mwFqdn { + description "This attribute represents FQDN of the P-CSCF for the Mw + interface."; + type string; + } + leaf-list mwIpv4Addresses { + description "List of ranges of PLMNs (including the PLMN + IDs of the CHF instance) that can be served by the CHF instance. + If not provided, the CHF can serve any PLMN."; + type inet:ipv4-address; + } + leaf-list mwIpv6Addresses { + description "This attribute represents list of IPv4 addresses of + the P-CSCF for the Mw interface."; + type inet:ipv6-address; + } + list servedIpv4AddressRanges { + description "List of ranges of PLMNs (including the PLMN + IDs of the CHF instance) that can be served by the CHF instance. + If not provided, the CHF can serve any PLMN."; + + min-elements 1; + key "mcc mnc"; + uses types3gpp:PLMNId; + } + } + grouping HssInfoGrp { + description " Information of an HSS NF Instance"; + leaf groupID{ + description "This attribute defines the identity of the HSS group + that is served by the HSS instance.If not provided, the HSS instance + does not pertain to any HSS group."; + type string; + } + list imsiRanges { + description "This attribute defines the list of ranges of IMSIs whose + profile data is available in the HSS instance."; + min-elements 1; + key "id"; + uses ImsiRange; + } + list imsPrivateIdentityRanges{ + description "This attribute defines the list of ranges of IMS Private + Identities whose profile data is available in the HSS instance."; + min-elements 1; + key "id"; + uses IdentityRange; + } + list imsPublicIdentityRanges{ + description "This attribute defines the list of ranges of MSISDNs whose + profile data is available in the HSS instance. "; + min-elements 1; + key "id"; + uses IdentityRange; + } + list msisdnRanges{ + description "This attribute defines the list of ranges of IMS Public + Identities whose profile data is available in the HSS instance "; + min-elements 1; + key "id"; + uses IdentityRange; + } + list externalGroupIdentifiersRanges{ + description "This attribute defines the list of ranges of external + group IDs that can be served by this HSS instance.If not provided, + the HSS instance does not serve any external groups. "; + min-elements 1; + key "id"; + uses IdentityRange; + } + list hssDiameterAddress{ + description "This attribute defines the Diameter Address of the HSS "; + max-elements 1; + uses NetworkNodeDiameterAddress; + } + list additionalDiamAddresses{ + description "This attribute defines the Additional Diameter Addresses + of the HSS;may be present if hssDiameterAddress is present "; + min-elements 1; + + uses NetworkNodeDiameterAddress; + } + + list dnnUpfInfoList { + description "List of parameters supported by the UPF per DNN."; + min-elements 1; + key dnn; + uses DnnUpfInfoItem; + } + } grouping nrfInfoGrp { list servedUdrInfo { @@ -726,8 +864,95 @@ module _3gpp-5gc-nrm-nfprofile { min-elements 1; uses chfInfo; } + + list servedNwdafInfo { + description "This attribute contains all the nwdafInfo attributes + locally configured in the NRF or the NRF received during NF + registration. The key of the map is the nfInstanceId of which + the nwdafInfo belongs to."; + + key nfInstanceId; + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + type string; + } + + min-elements 1; + uses nwdaf3gpp:NwdafInfoGrp; + } + list servedPcscfInfoList { + description "This attribute contains all the pcscfInfo attributes + locally configured in the NRF or the NRF received during NF + registration. The key of the map is the nfInstanceId to which + the map entry belongs to."; + + key nfInstanceId; + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + type string; + } + + min-elements 1; + uses pcscfInfo; + } + list servedGmlcInfo { + description "This attribute contains all the gmlcInfo attributes + locally configured in the NRF or the NRF received during NF + registration. The key of the map is the nfInstanceId of which + the nefInfo belongs to."; + key nfInstanceId; + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + type string; + } + + min-elements 1; + uses gmlc3gpp:GmlcInfoGrp; + } + list servedLmfInfo { + description "This attribute contains all the lmfInfo attributes + locally configured in the NRF or the NRF received during NF + registration. The key of the map is the nfInstanceId of which + the lmfInfo belongs to."; + key nfInstanceId; + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + type string; + } + + min-elements 1; + uses lmf3gpp:LmfInfoGrp; + } + list servedNfInfo { + description "This attribute contains information of other NFs + without corresponding NF type specific Info extensions locally + configured in the NRF or the NRF received during NF registration. + The key of the map is the nfInstanceId of the NF. The map entry + is the NfInfo as defined in clause 5.3.229 representing the + information of a generic NF instance."; + key nfInstanceId; + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + type string; + } + + min-elements 1; + uses nfInfoGrp; + } + list servedHssInfoList { + description "This attribute contains list of HssInfo attribute + locally configured in the NRF or that the NRF received during NF + registration. The key of the map is the nfInstanceId to which the + map entry belongs to."; + key nfInstanceId; + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + type string; + } + min-elements 1; + uses HssInfoGrp; + } } - list nrfInfo { description "nrfinfo"; key idx; @@ -735,6 +960,21 @@ module _3gpp-5gc-nrm-nfprofile { max-elements 1; uses nrfInfoGrp; } + list nfInfo { + description "nrfinfo"; + key idx; + leaf idx { type uint32; } + max-elements 1; + uses nfInfoGrp; + } + grouping nfInfoGrp { + description "This data type represents the information of a + generic NF Instance. (See clause 6.1.6.2.56 TS 29.510 [23])."; + leaf nfType { + description "This parameter defines type of Network Function"; + type uint16; + } + } leaf customInfo { description "Specific data for custom Network Functions."; @@ -887,34 +1127,6 @@ module _3gpp-5gc-nrm-nfprofile { } } - grouping TacRange { - leaf start { - description "First value identifying the start of a TAC range, - to be used when the range of TAC's can be represented - as a hexadecimal range (e.g., TAC ranges)."; - type string { - pattern '^([A-Fa-f0-9]{4}|[A-Fa-f0-9]{6}$)'; - } - } - - leaf end { - description "Last value identifying the end of a TAC range, - to be used when the range of TAC's can be represented as - a hexadecimal range (e.g. TAC ranges)."; - type string { - pattern '^([A-Fa-f0-9]{4}|[A-Fa-f0-9]{6})$'; - } - } - - leaf nRTACpattern { - description "Pattern (regular expression according to the ECMA-262) - representing the set of TAC's belonging to this range. - A TAC value is considered part of the range if and only if the - TAC string fully matches the regular expression."; - type string; - } - } - grouping SnssaiUpfInfoItem { list sNssai { description "Supported S-NSSAI."; @@ -923,15 +1135,8 @@ module _3gpp-5gc-nrm-nfprofile { key "sst sd"; uses Snssai; } - - list dnnUpfInfoList { - description "List of parameters supported by the UPF per DNN."; - min-elements 1; - key dnn; - uses DnnUpfInfoItem; - } } - + grouping DnnUpfInfoItem { leaf dnn { description "String representing a Data Network."; @@ -1056,24 +1261,7 @@ module _3gpp-5gc-nrm-nfprofile { enum N9; } } - - grouping TaiRangeGrp { - list plmnId { - description "PLMN ID related to the TacRange."; - min-elements 1; - max-elements 1; - key "mcc mnc"; - uses types3gpp:PLMNId; - } - - list tacRangeList { - description "The range of the TACs."; - min-elements 1; - key "start end"; - uses TacRange; - } - } - + typedef AccessType { type enumeration { enum 3GPP_ACCESS; @@ -1158,4 +1346,51 @@ module _3gpp-5gc-nrm-nfprofile { uses Snssai; } } + grouping ImsiRange{ + leaf-list start{ + description "This attribute indicates the first value identifying + the start of a IMSI range. "; + max-elements 1; + type string{ + pattern "^[0-9]+$"; + } + } + leaf-list end{ + description "This attribute indicates the last value identifying + the end of a IMSI range."; + max-elements 1; + type string{ + pattern "^[0-9]+$"; + } + } + leaf-list pattern{ + description "This attribute indicates pattern (regular expression + according to the ECMA-262 dialect [75]) representing the set of + IMSIs belonging to this range. An IMSI value is considered part + of the range if and only if the IMSI string fully matches the + regular expression.Either the start and end attributes, or the + pattern attribute, shall be present."; + max-elements 1; + type string; + } + } + grouping NetworkNodeDiameterAddress { + leaf-list name{ + description "This attribute indicates the Diameter + name of the network node diameter address."; + reference " See TS 29.571 [61]. String contains a Diameter Identity + (FQDN)."; + type string; + min-elements 1; + max-elements 1; + } + leaf-list realm{ + description "This attribute indicates the Diameter realm of the + network node diameter addres. See TS 29.571 [61]. String contains + a Diameter Identity (FQDN)."; + type string; + min-elements 1; + max-elements 1; + } + } } diff --git a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang index be566c2b3..56ddd282c 100755 --- a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang @@ -11,7 +11,6 @@ module _3gpp-5gc-nrm-nwdaffunction { 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"; @@ -21,6 +20,7 @@ module _3gpp-5gc-nrm-nwdaffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-03-25 { reference CR-1489 ; } revision 2024-08-07 { reference CR-1329; } revision 2024-04-12 { reference CR-1218; } revision 2023-09-18 { reference CR-1043; } @@ -203,7 +203,7 @@ module _3gpp-5gc-nrm-nwdaffunction { key idx ; leaf idx { type uint32; } description "The range of TAIs."; - uses nfp3gpp:TaiRangeGrp; + uses types5g3gpp:TaiRangeGrp; } list nwdafCapability { diff --git a/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang b/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang index ca2dc8cbc..22346b760 100755 --- a/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang +++ b/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang @@ -18,6 +18,7 @@ module _3gpp-5gc-nrm-predefinedpccruleset { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-03-25 { reference CR-1489 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } revision 2020-10-04 { reference "CR-0393"; } -- GitLab From b410a0375e1d0e69d1bb016ab22c2fc0eed7861a Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 27 Mar 2025 23:34:21 +0100 Subject: [PATCH 20/94] small updates --- yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang | 2 +- yang-models/_3gpp-common-managed-element.yang | 2 +- yang-models/_3gpp-common-mecontext.yang | 4 ++-- yang-models/_3gpp-common-subnetwork.yang | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang index c14d427de..9e3a4a1c0 100755 --- a/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang +++ b/yang-models/_3gpp-5gc-nrm-dynamic5qiset.yang @@ -15,7 +15,7 @@ module _3gpp-5gc-nrm-dynamic5qiset { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the dynamic 5QIs including their QoS characteristics. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index 785522ae4..40fb72275 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -21,7 +21,7 @@ module _3gpp-common-managed-element { description "Defines ManagedElement which will be augmented by other IOCs - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) diff --git a/yang-models/_3gpp-common-mecontext.yang b/yang-models/_3gpp-common-mecontext.yang index 5b6b0c0ad..9a5b420ec 100644 --- a/yang-models/_3gpp-common-mecontext.yang +++ b/yang-models/_3gpp-common-mecontext.yang @@ -13,7 +13,7 @@ module _3gpp-common-mecontext { 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, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -25,7 +25,7 @@ module _3gpp-common-mecontext { Integration Reference Point (IRP); Information Service (IS)"; - revision 2025-03-25 { reference "CR-0516"; } + revision 2025-03-25 { reference "CR-00525"; } revision 2025-03-24 { reference "CR-0517 CR-0382 CR-0516"; } revision 2024-07-17 { reference "CR-0381 CR-0382 CR-0383"; } diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang index e4fafa21f..8f0b9787e 100755 --- a/yang-models/_3gpp-common-subnetwork.yang +++ b/yang-models/_3gpp-common-subnetwork.yang @@ -21,7 +21,7 @@ module _3gpp-common-subnetwork { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines basic SubNetwork which will be augmented by other IOCs - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 20254, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) -- GitLab From ac76dc59dcc5544c19933ea671f8d01e0b235bab Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Fri, 28 Mar 2025 00:48:54 +0100 Subject: [PATCH 21/94] small updates 2 --- yang-models/_3gpp-common-mecontext.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-mecontext.yang b/yang-models/_3gpp-common-mecontext.yang index 9a5b420ec..9f5dceae0 100644 --- a/yang-models/_3gpp-common-mecontext.yang +++ b/yang-models/_3gpp-common-mecontext.yang @@ -26,7 +26,7 @@ module _3gpp-common-mecontext { Information Service (IS)"; revision 2025-03-25 { reference "CR-00525"; } - revision 2025-03-24 { reference "CR-0517 CR-0382 CR-0516"; } + revision 2025-03-24 { reference "CR-0517 CR-0516"; } revision 2024-07-17 { reference "CR-0381 CR-0382 CR-0383"; } grouping MeContextGrp { -- GitLab From 39adf37d9ff73339885f36752564371dd6356679 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 28 Mar 2025 09:43:29 +0100 Subject: [PATCH 22/94] added ProSeCapability to _3gpp-5gc-nrm-nfprofile.yang and corrected yang errors --- yang-models/_3gpp-5gc-nrm-gmlcfunction.yang | 2 +- yang-models/_3gpp-5gc-nrm-nfprofile.yang | 141 ++++++++++++++++++-- 2 files changed, 130 insertions(+), 13 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-gmlcfunction.yang b/yang-models/_3gpp-5gc-nrm-gmlcfunction.yang index 689f35673..f516d33f7 100644 --- a/yang-models/_3gpp-5gc-nrm-gmlcfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-gmlcfunction.yang @@ -13,7 +13,7 @@ module _3gpp-5gc-nrm-gmlcfunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This module defines the GMLC Function IOC per 3GPP TS 28.541. Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, - TTA, TTC). All rights reserved.";"; + TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; revision 2025-03-25 { reference CR-1489 ; } diff --git a/yang-models/_3gpp-5gc-nrm-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-nfprofile.yang index 696f47231..534e310d3 100755 --- a/yang-models/_3gpp-5gc-nrm-nfprofile.yang +++ b/yang-models/_3gpp-5gc-nrm-nfprofile.yang @@ -272,7 +272,7 @@ module _3gpp-5gc-nrm-nfprofile { type string; } } - + grouping ausfInfo { leaf groupId { @@ -486,7 +486,68 @@ module _3gpp-5gc-nrm-nfprofile { type PduSessionType; } } - + grouping ProSeCapability { + leaf proseDirectDiscovery { + type boolean; + description "Indicates support for ProSe Direct Discovery."; + } + leaf proseDirectCommunication { + type boolean; + description "Indicates support for ProSe Direct Communication."; + } + leaf proseL2UetoNetworkRelay { + type boolean; + description "Indicates support for ProSe Layer-2 UE-to-Network Relay.."; + } + leaf proseL3UetoNetworkRelay { + type boolean; + description "Indicates support for ProSe Layer-3 UE-to-Network Relay."; + } + leaf proseL2RemoteUe { + type boolean; + description "Indicates support for ProSe Layer-2 Remote UE."; + } + leaf proseL3RemoteUe { + type boolean; + description "Indicates support for ProSe Layer-3 Remote UE."; + } + leaf proseL2UetoUeRelay { + type boolean; + description "Indicates support for ProSe Layer-2 UE-to-UE Relay."; + } + leaf proseL3UetoUeRelay { + type boolean; + description "Indicates support for ProSe Layer-3 UE-to-UE Relay."; + } + leaf proseL2EndUe { + type boolean; + description "Indicates support for ProSe Layer-2 End UE."; + } + leaf proseL3EndUe { + type boolean; + description "Indicates support for ProSe Layer-3 End UE."; + } + leaf proseL3IntermRelay { + type boolean; + description "Indicates support for ProSe Layer-3 Intermediate Relay."; + } + leaf proseL3MultihopRemote { + type boolean; + description "Indicates support for ProSe Layer-3 Multihop Remote."; + } + leaf proseL3NetMultihopRelay { + type boolean; + description "Indicates support for ProSe Layer-3 Network Multihop Relay."; + } + leaf proseL3UeMultihopRelay { + type boolean; + description "Indicates support for ProSe Layer-3 UE Multihop Relay."; + } + leaf proseL3EndUeMultihop { + type boolean; + description "Indicates support for ProSe Layer-3 End UE Multihop."; + } + } grouping pcfInfo { leaf-list dnnList { @@ -522,6 +583,11 @@ module _3gpp-5gc-nrm-nfprofile { type string; } + list proseCapability { + description "It indicates the supported ProSe Capability by the PCF."; + uses ProSeCapability; + config false; + } } grouping bsfInfo { @@ -668,6 +734,10 @@ module _3gpp-5gc-nrm-nfprofile { profile data is available in the HSS instance."; min-elements 1; key "id"; + leaf id { + description "Unique identifier for the IMSI range."; + type string; + } uses ImsiRange; } list imsPrivateIdentityRanges{ @@ -675,6 +745,10 @@ module _3gpp-5gc-nrm-nfprofile { Identities whose profile data is available in the HSS instance."; min-elements 1; key "id"; + leaf id { + description "Unique identifier for the IMSI range."; + type string; + } uses IdentityRange; } list imsPublicIdentityRanges{ @@ -682,6 +756,10 @@ module _3gpp-5gc-nrm-nfprofile { profile data is available in the HSS instance. "; min-elements 1; key "id"; + leaf id { + description "Unique identifier for the IMSI range."; + type string; + } uses IdentityRange; } list msisdnRanges{ @@ -689,6 +767,10 @@ module _3gpp-5gc-nrm-nfprofile { Identities whose profile data is available in the HSS instance "; min-elements 1; key "id"; + leaf id { + description "Unique identifier for the IMSI range."; + type string; + } uses IdentityRange; } list externalGroupIdentifiersRanges{ @@ -697,18 +779,31 @@ module _3gpp-5gc-nrm-nfprofile { the HSS instance does not serve any external groups. "; min-elements 1; key "id"; + leaf id { + description "Unique identifier for the IMSI range."; + type string; + } uses IdentityRange; } list hssDiameterAddress{ description "This attribute defines the Diameter Address of the HSS "; max-elements 1; + key "id"; + leaf id { + description "Unique identifier for the IMSI range."; + type string; + } uses NetworkNodeDiameterAddress; } list additionalDiamAddresses{ description "This attribute defines the Additional Diameter Addresses of the HSS;may be present if hssDiameterAddress is present "; min-elements 1; - + key "id"; + leaf id { + description "Unique identifier for the IMSI range."; + type string; + } uses NetworkNodeDiameterAddress; } @@ -718,7 +813,19 @@ module _3gpp-5gc-nrm-nfprofile { key dnn; uses DnnUpfInfoItem; } - } + } + grouping FiveGDdnmfInfo { + description "This data type represents the specific data for the 5G DDMF NF. + See clause 6.1.6.2.74 of TS 29.510."; + list plmnId { + description "PLMN ID for which list of supported S-NSSAI(s) + is provided."; + min-elements 1; + max-elements 1; + key "mcc mnc"; + uses types3gpp:PLMNId; + } + } grouping nrfInfoGrp { list servedUdrInfo { @@ -951,7 +1058,20 @@ module _3gpp-5gc-nrm-nfprofile { } min-elements 1; uses HssInfoGrp; - } + } + list served5gDdnmfInfo { + description "This attribute contains all the 5gDdnmfInfo + attribute locally configured in the NRF or that the NRF + received during NF registration. The key of the map is + the nfInstanceId to which the map entry belongs to."; + key nfInstanceId; + leaf nfInstanceId { + description "String uniquely identifying a NF instance."; + type string; + } + min-elements 1; + uses FiveGDdnmfInfo ; + } } list nrfInfo { description "nrfinfo"; @@ -1347,30 +1467,27 @@ module _3gpp-5gc-nrm-nfprofile { } } grouping ImsiRange{ - leaf-list start{ + leaf start{ description "This attribute indicates the first value identifying the start of a IMSI range. "; - max-elements 1; type string{ pattern "^[0-9]+$"; } } - leaf-list end{ + leaf end{ description "This attribute indicates the last value identifying the end of a IMSI range."; - max-elements 1; type string{ pattern "^[0-9]+$"; + } } - } - leaf-list pattern{ + leaf pattern{ description "This attribute indicates pattern (regular expression according to the ECMA-262 dialect [75]) representing the set of IMSIs belonging to this range. An IMSI value is considered part of the range if and only if the IMSI string fully matches the regular expression.Either the start and end attributes, or the pattern attribute, shall be present."; - max-elements 1; type string; } } -- GitLab From f302f4163de7b13b44850d15d162a6a3d23c5f08 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 28 Mar 2025 20:38:52 +0100 Subject: [PATCH 23/94] correcting yang validation error --- yang-models/_3gpp-5gc-nrm-neffunction.yang | 5 +---- yang-models/_3gpp-5gc-nrm-nfprofile.yang | 5 +---- yang-models/_3gpp-common-fm.yang | 3 --- yang-models/_3gpp-common-trace.yang | 8 ++------ yang-models/_3gpp-common-yang-types.yang | 4 +--- 5 files changed, 5 insertions(+), 20 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-neffunction.yang b/yang-models/_3gpp-5gc-nrm-neffunction.yang index 56cf7c0f0..8b65a1276 100755 --- a/yang-models/_3gpp-5gc-nrm-neffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-neffunction.yang @@ -20,11 +20,8 @@ module _3gpp-5gc-nrm-neffunction { Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; -<<<<<<< HEAD + revision 2025-03-25 { reference CR-1489 ; } -======= - ->>>>>>> ac76dc59dcc5544c19933ea671f8d01e0b235bab revision 2025-01-25 { reference CR-1442 ; } revision 2024-05-18 { reference CR-1273 ; } revision 2024-04-12 { reference CR-1218 ; } diff --git a/yang-models/_3gpp-5gc-nrm-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-nfprofile.yang index acdd5c9a9..1fe9b0671 100755 --- a/yang-models/_3gpp-5gc-nrm-nfprofile.yang +++ b/yang-models/_3gpp-5gc-nrm-nfprofile.yang @@ -19,11 +19,8 @@ module _3gpp-5gc-nrm-nfprofile { Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 29.510"; - -<<<<<<< HEAD + revision 2025-03-25 { reference CR-1489 ; } -======= ->>>>>>> ac76dc59dcc5544c19933ea671f8d01e0b235bab revision 2025-01-25 { reference CR-1442 ; } revision 2024-04-12 { reference CR-1218 ; } revision 2023-11-18 { reference CR-1103 ; } diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index 996928652..4ffc893ce 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -17,10 +17,7 @@ module _3gpp-common-fm { TTA, TTC). All rights reserved."; reference "3GPP TS 28.111"; -<<<<<<< HEAD -======= revision 2025-03-25 { reference CR-0026; } ->>>>>>> ac76dc59dcc5544c19933ea671f8d01e0b235bab revision 2025-02-07 { reference CR-0022 ; } revision 2024-05-12 { description "The definition of the module was moved from TS 28.623 to diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index ab8c69125..2ec6b33ea 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -20,18 +20,14 @@ module _3gpp-common-trace { 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)" ; -<<<<<<< HEAD -======= - revision 2025-02-07 { reference "CR-0504"; } + revision 2025-02-07 { reference "CR-0504" ; } revision 2025-02-05 { reference "CR-0461" ; } ->>>>>>> ac76dc59dcc5544c19933ea671f8d01e0b235bab - revision 2024-11-25 { reference CR-0492; } + revision 2024-11-25 { reference "CR-0492" ; } revision 2024-11-07 { reference "CR-0480"; } revision 2024-10-01 { reference "CR-0457"; } revision 2024-08-13 { reference "CR-0387 CR-0377"; } diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 373f25071..e060a1203 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -16,10 +16,8 @@ module _3gpp-common-yang-types { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623"; -<<<<<<< HEAD -======= + revision 2025-02-19 { reference CR-0512; } ->>>>>>> ac76dc59dcc5544c19933ea671f8d01e0b235bab revision 2025-02-07 { reference CR-0492; } revision 2024-11-25 { reference CR-1442; } revision 2024-11-25 { reference CR-1412; } -- GitLab From bb23ae0d975adc369ab7a6b666416cf5ab319d19 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 28 Mar 2025 20:49:16 +0100 Subject: [PATCH 24/94] correcting long line innfprofile --- yang-models/_3gpp-5gc-nrm-nfprofile.yang | 28 +++++++++++++++--------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-nfprofile.yang index 1fe9b0671..354d8b8ac 100755 --- a/yang-models/_3gpp-5gc-nrm-nfprofile.yang +++ b/yang-models/_3gpp-5gc-nrm-nfprofile.yang @@ -497,27 +497,33 @@ module _3gpp-5gc-nrm-nfprofile { } leaf proseL2UetoNetworkRelay { type boolean; - description "Indicates support for ProSe Layer-2 UE-to-Network Relay.."; + description "Indicates support for ProSe Layer-2 + UE-to-Network Relay.."; } leaf proseL3UetoNetworkRelay { type boolean; - description "Indicates support for ProSe Layer-3 UE-to-Network Relay."; + description "Indicates support for ProSe Layer-3 + UE-to-Network Relay."; } leaf proseL2RemoteUe { type boolean; - description "Indicates support for ProSe Layer-2 Remote UE."; + description "Indicates support for ProSe Layer-2 + Remote UE."; } leaf proseL3RemoteUe { type boolean; - description "Indicates support for ProSe Layer-3 Remote UE."; + description "Indicates support for ProSe Layer-3 + Remote UE."; } leaf proseL2UetoUeRelay { type boolean; - description "Indicates support for ProSe Layer-2 UE-to-UE Relay."; + description "Indicates support for ProSe Layer-2 + UE-to-UE Relay."; } leaf proseL3UetoUeRelay { type boolean; - description "Indicates support for ProSe Layer-3 UE-to-UE Relay."; + description "Indicates support for ProSe Layer-3 + UE-to-UE Relay."; } leaf proseL2EndUe { type boolean; @@ -529,7 +535,8 @@ module _3gpp-5gc-nrm-nfprofile { } leaf proseL3IntermRelay { type boolean; - description "Indicates support for ProSe Layer-3 Intermediate Relay."; + description "Indicates support for ProSe Layer-3 + Intermediate Relay."; } leaf proseL3MultihopRemote { type boolean; @@ -537,7 +544,8 @@ module _3gpp-5gc-nrm-nfprofile { } leaf proseL3NetMultihopRelay { type boolean; - description "Indicates support for ProSe Layer-3 Network Multihop Relay."; + description "Indicates support for ProSe Layer-3 Network Multihop + Relay."; } leaf proseL3UeMultihopRelay { type boolean; @@ -989,8 +997,8 @@ module _3gpp-5gc-nrm-nfprofile { } list servedPcscfInfoList { description "This attribute contains all the pcscfInfo attributes - locally configured in the NRF or the NRF received during NF - registration. The key of the map is the nfInstanceId to which + locally configured in the NRF or the NRF received during NF + registration. The key of the map is the nfInstanceId to which the map entry belongs to."; key nfInstanceId; -- GitLab From d20ac4b8bce24b4d1c06a9edb347a2fe56bf8a54 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Fri, 28 Mar 2025 21:42:20 +0100 Subject: [PATCH 25/94] updated subscriptioncontrol --- .../_3gpp-common-subscription-control.yang | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang index b637e1ff5..48aa7bb05 100755 --- a/yang-models/_3gpp-common-subscription-control.yang +++ b/yang-models/_3gpp-common-subscription-control.yang @@ -5,12 +5,13 @@ module _3gpp-common-subscription-control { import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } - + import ietf-yang-types { prefix yang; } + organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines IOCs for subscription and heartbeat control. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -18,6 +19,7 @@ module _3gpp-common-subscription-control { Solution Set (SS) definitions 3GPP TS 28.623"; + revision 2025-03-24 { reference CR-0516 ; } revision 2024-05-18 { reference CR-0359 ; } revision 2024-01-18 { reference "CR-0309 CR-0329" ; } revision 2023-09-18 { reference CR-0271 ; } @@ -84,11 +86,26 @@ module _3gpp-common-subscription-control { } } case dataNodeSelector { - leaf dataNodeSelector { - type string; + container dataNodeSelector { description "The value shall follow the rules of RFC 8641 filter-spec"; - reference "RFC 8641 section 5."; + reference "RFC 8641 section 5. and ietf-yang-push.yang"; + choice dataNodeSelector { + anydata datastore-subtree-filter { + description "Subtree filter"; + reference + "RFC 6241: Network Configuration Protocol (NETCONF), Section 6"; + } + leaf datastore-xpath-filter { + type yang:xpath1.0; + description "XPath-filter"; + reference + "XML Path Language (XPath) Version 1.0 + (https://www.w3.org/TR/1999/REC-xpath-19991116) + RFC 7950: The YANG 1.1 Data Modeling Language, + Section 10"; + } + } } } } @@ -114,7 +131,7 @@ module _3gpp-common-subscription-control { list scope { description "Scopes (selects) data nodes in an object tree."; key idx; - max-elements 8; + max-elements 1; leaf idx { type string; } uses ScopeGrp; } -- GitLab From f454918799553555b0516c03dd4a05a0a034a5a2 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Fri, 11 Apr 2025 01:10:19 +0200 Subject: [PATCH 26/94] updated thresholdinfo, thereby removed CR22, file is same in R18 and R19 --- yang-models/_3gpp-common-fm.yang | 146 +++++++++++++++++++++++++++++-- 1 file changed, 140 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index 4ffc893ce..308f0dfd6 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -7,7 +7,6 @@ module _3gpp-common-fm { import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } - import _3gpp-common-measurements { prefix meas3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -17,11 +16,9 @@ module _3gpp-common-fm { TTA, TTC). All rights reserved."; reference "3GPP TS 28.111"; - revision 2025-03-25 { reference CR-0026; } - revision 2025-02-07 { reference CR-0022 ; } + revision 2025-03-25 { reference "CR-0025 CR-0026"; } revision 2024-05-12 { - description "The definition of the module was moved from TS 28.623 to - TS 28.111"; + description "The definition of the module was from TS 28.623 to TS 28.111"; reference CR-0008 ; } revision 2024-03-06 { reference CR-0333 ; } @@ -136,6 +133,141 @@ module _3gpp-common-fm { } } + grouping ThresholdHysteresisGrp { + description "The ThresholdHysteresis defines the threshold boundaries to + control the hysteresis mechanism. + + The high attribute of ThresholdHysteresis identifies the higher value of + a threshold with hysteris, the integer type is used for counter + thresholds and the float type for gauge thresholds. The low attribute + of ThresholdHysteresis identifies the lower value of a threshold with + hysteresis, applicable only to gauge thresholds."; + + leaf high { + type union { + type int64; + type decimal64 { + fraction-digits 7; + } + } + mandatory true; + description "Higher value of a threshold with hysteris, the integer type + is used for counter thresholds and the float type for gauge + thresholds."; + } + + leaf low { + type decimal64 { + fraction-digits 7; + } + description "Lower value of a threshold with hysteresis, applicable + only to gauge thresholds."; + } + } + + grouping ThresholdLevelIndGrp { + description "The up attribute indicates for counter and gauge thresholds + that the threshold crossing occurred when going up. The down attribute + only indicates for gauge thresholds that the threshold crossing occurred + when going down, applicable only to gauge thresholds."; + + list up { + description "Indicates for counter and gauge thresholds that the + threshold crossing occurred when going up."; + max-elements 1; + key idx; + leaf idx { type int32; } + uses ThresholdHysteresisGrp; + } + + list down { + description "Indicates for gauge thresholds that the threshold crossing + occurred when going down, applicable only to gauge thresholds."; + max-elements 1; + key idx; + leaf idx { type int32; } + uses ThresholdHysteresisGrp; + } + } + + grouping ThresholdCrossingGrp { + description "The datatype indicates the crossed threshold + information regardless of the gauge threshold, which represents an + instantaneous value that changes over time, or the counter threshold, + which represents monotonically increasing cumulative quantity. + + The observedMeasurement attribute of TheresholdInfo specifies the name + of the monitored measurement that crossed the threshold and that + caused the notification (Rec. ITU-T X. 733[8]). The observedValue + attribute indicates the value of the gauge or counter which crossed + the threshold. This may be different from the threshold value if, for + example, the gauge may only take on discrete values. Integer values + are used for counters and float values for gauges (Rec. ITU-T X. 733). + Note that a 'number' type property can contain both integers and + floating point numbers. + + For the thresholdLevel attribute, in the case of a gauge, it specifies + a pair of threshold values, the first being the value of the crossed + threshold and the second, its corresponding hysteresis; in the case of + a counter, it specifies only the threshold value (Rec. ITU-T X. 733). + + For the armTime attribute, for a gauge threshold, it specifies the + time at which the threshold was last re-armed, namely the time after + the previous threshold crossing at which the hysteresis value of the + threshold was exceeded thus again permitting generation of + notifications when the threshold is crossed; for a counter threshold, + the later of the time at which the threshold offset was last applied, + or the time at which the counter was last initialized (for resettable + counters) (Rec. ITU-T X. 733)."; + + leaf observedMeasurement { + type string; + mandatory true; + description "The name of the monitored measurement that crossed the + threshold and that caused the notification (Rec. ITU-T X. 733 "; + } + + leaf observedValue { + type union { + type int64; + type decimal64 { + fraction-digits 7; + } + } + mandatory true; + description "The value of the gauge or counter which crossed the + threshold. This may be different from the threshold value if, for + example, the gauge may only take on discrete values. + Integer values are used for counters and float values for gauges + (Rec. ITU-T X. 733). Note that a 'number' type property can contain + both integers and floating point numbers."; + } + + list thresholdLevel { + description "In the case of a gauge the threshold level specifies + a pair of threshold values, the first being the value of the crossed + threshold and the second, its corresponding hysteresis; in the case + of a counter the threshold level specifies only the threshold value + (Rec. ITU-T X. 733)."; + max-elements 1; + key idx; + leaf idx { type int32; } + uses ThresholdLevelIndGrp; + } + + leaf armTime { + type yang:date-and-time; + description "For a gauge threshold, the time at which the threshold + was last re-armed, namely the time after the previous threshold + crossing at which the hysteresis value of the threshold was + exceeded thus again permitting generation of notifications when the + threshold is crossed. For a counter threshold, the later of the time + at which the threshold offset was last applied, or the time at + which the counter was last initialized (for resettable counters) + (Rec. ITU-T X. 733)"; + } + } + grouping AlarmRecordGrp { description "Contains alarm information of an alarmed object instance. A new record is created in the alarm list when an alarmed object @@ -267,7 +399,9 @@ module _3gpp-common-fm { config false ; yext3gpp:notNotifyable; description "Indicates the crossed threshold"; - uses meas3gpp:ThresholdInfoGrp; + key idx; + leaf idx { type int32; } + uses ThresholdCrossingGrp; } list stateChangeDefinition { -- GitLab From 82920df312a3084235d073c042245c5636717630 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Fri, 11 Apr 2025 01:33:21 +0200 Subject: [PATCH 27/94] updated date of common-files as the previous date was used also in r18 --- yang-models/_3gpp-common-files.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-files.yang b/yang-models/_3gpp-common-files.yang index 726292a70..fb22a847a 100644 --- a/yang-models/_3gpp-common-files.yang +++ b/yang-models/_3gpp-common-files.yang @@ -25,7 +25,7 @@ module _3gpp-common-files { Integration Reference Point (IRP); Information Service (IS)"; - revision 2024-05-11 { reference CR-0362 ; } + revision 2024-05-25 { reference CR-0362 ; } revision 2023-09-18 { reference CR-0271 ; } revision 2022-09-28 { reference CR-0191; } -- GitLab From 4f6383757a7f13d3a3be893b274d8d40aa6091ef Mon Sep 17 00:00:00 2001 From: elmdahlp Date: Fri, 28 Mar 2025 09:55:28 +0000 Subject: [PATCH 28/94] Update _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index b7c05dddd..357bd4a5d 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -20,6 +20,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2024-03-25 { reference "CR-1509"; } revision 2025-01-25 { reference "CR-1442"; } revision 2024-11-07 { reference "CR-1443"; } revision 2024-08-19 { reference "CR-1405"; } @@ -252,6 +253,13 @@ module _3gpp-nr-nrm-gnbcucpfunction { enabled or disabled."; } + leaf dLTMControl { + type boolean; + default false; + description "This attribute determines whether the distributed SON + function LTM Cell Switch is enabled or disabled."; + } + list qceIdMappingInfoList { description "List of the mapping relationship between QoE collection entity identity, PLMN where QoE collection entity resides, and the IP address of -- GitLab From 7f1978b385acf2089a2b6bbc700af60eed6bd9c5 Mon Sep 17 00:00:00 2001 From: elmdahlp Date: Fri, 28 Mar 2025 10:12:56 +0000 Subject: [PATCH 29/94] Update _3gpp-nr-nrm-gnbcucpfunction.yang --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 357bd4a5d..037c7c625 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -20,7 +20,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2024-03-25 { reference "CR-1509"; } + revision 2025-03-25 { reference "CR-1509"; } revision 2025-01-25 { reference "CR-1442"; } revision 2024-11-07 { reference "CR-1443"; } revision 2024-08-19 { reference "CR-1405"; } @@ -357,7 +357,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { leaf gnbIdLength { type int32 {range "22..32";} - mandatory true; + mandatory true; description "This indicates the number of bits for encoding the gNB ID. See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; } -- GitLab From 34615b26a39d904baf0fc9bd8131b36dfd14c5cc Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 26 Mar 2025 18:57:04 +0000 Subject: [PATCH 30/94] Update _3gpp-nr-nrm-drachoptimizationfunction.yang --- .../_3gpp-nr-nrm-drachoptimizationfunction.yang | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang b/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang index 399bd2bfd..d611a73f4 100755 --- a/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang +++ b/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang @@ -14,10 +14,11 @@ module _3gpp-nr-nrm-drachoptimizationfunction { description "Defines the YANG mapping of the DRACHOptimizationFunction 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 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-03-27 { reference CR-xxxx ; } revision 2023-09-18 { reference CR-1043 ; } revision 2021-08-05 { reference S5-214053/CR-0518; } revision 2021-01-25 { reference CR-0454 ; } @@ -52,7 +53,13 @@ module _3gpp-nr-nrm-drachoptimizationfunction { type TargetProbabilityT; } leaf numberofpreamblessent { - description "This attribute determines the number of preambles sent."; + description "This attribute indicates the number of preambles sent + used to configure a wanted distribution of RACH preambles in a + vendor implemented DRACH optimisation function. + Note: The DRACH optimization function may configure preambleTransMax + as defined in TS 38.331 [54]. The allowed values for preambleTransMax + are 3, 4, 5, 6, 7, 8, 10, 20, 50, 100, 200 (see 38.331 [54], + subclause 6.3.2)."; mandatory true; type NumberofpreamblessentT; } -- GitLab From d07f53468aa9f1520f2dd88c08a23263c22a1f8c Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 28 Mar 2025 20:14:50 +0000 Subject: [PATCH 31/94] Update _3gpp-nr-nrm-drachoptimizationfunction.yang --- yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang b/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang index d611a73f4..0fa118413 100755 --- a/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang +++ b/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang @@ -18,7 +18,7 @@ module _3gpp-nr-nrm-drachoptimizationfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2025-03-27 { reference CR-xxxx ; } + revision 2025-03-27 { reference CR-1504 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2021-08-05 { reference S5-214053/CR-0518; } revision 2021-01-25 { reference CR-0454 ; } -- GitLab From 1018a9341c10ff0dfc7af160c1c0014f656dd007 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Tue, 15 Apr 2025 08:39:20 +0000 Subject: [PATCH 32/94] Edit _3gpp-nr-nrm-drachoptimizationfunction.yang Updated revision date to conform to the rule in 32.160 clause 6.2.1.13 In order to avoid reusing the same revision date in multiple releases, when a new YANG module revision is needed the revision date should be set as follows. Instead of setting the exact revision date when the module was last edited, the date nearest to that day that is not in the future and that follows the rule below should be used. When divided by 6, the day in the date should have the same remainder as the release number: (DAY modulo 6 == releaseNumber modulo 6). --- yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang b/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang index 0fa118413..6b4ac81bb 100755 --- a/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang +++ b/yang-models/_3gpp-nr-nrm-drachoptimizationfunction.yang @@ -18,7 +18,7 @@ module _3gpp-nr-nrm-drachoptimizationfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2025-03-27 { reference CR-1504 ; } + revision 2025-03-25 { reference CR-1504 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2021-08-05 { reference S5-214053/CR-0518; } revision 2021-01-25 { reference CR-0454 ; } -- GitLab From d8333fc05e163f73c07a451977c4fcb12aaf14a0 Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Wed, 26 Mar 2025 17:34:37 +0000 Subject: [PATCH 33/94] Update _3gpp-5gc-nrm-predefinedpccruleset.yang additional attributes to pccRuleSet --- .../_3gpp-5gc-nrm-predefinedpccruleset.yang | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang b/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang index 22346b760..9791ef4e3 100755 --- a/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang +++ b/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang @@ -609,6 +609,29 @@ module _3gpp-5gc-nrm-predefinedpccruleset { description "It contains transports TSCAI input parameters for TSC traffic at the ingress of the NW-TT (downlink flow direction)."; uses TscaiInputContainer; } + leaf easRedisInd { + type boolean; + default false; + description "Indicates whether the EAS rediscovery is required for the application."; + } + leaf tscaiTimeDom { + type uint32; + description "Indicates the (g)PTP domain that the (TSN)AF is located in."; + } + leaf capBatAdaptation { + type boolean; + default false; + description "Indicates the capability for AF to adjust the burst sending time."; + } + leaf disUeNotif { + type boolean; + default false; + description "Indicates whether QoS flow parameter signalling to the UE is disabled (TRUE), when the SMF is notified by the NG-RAN of changes in the fulfilled QoS situation,"; + } + leaf packFiltAllPrec { + type uint32; + description "Determines the order of TFT packet filter allocation for PCC rules."; + } } grouping PredefinedPccRuleSetGrp { -- GitLab From 3fa194d4254a309e1fd13bc7ac271e2c607c02a9 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Tue, 15 Apr 2025 12:51:59 +0000 Subject: [PATCH 34/94] Edit _3gpp-5gc-nrm-predefinedpccruleset.yang Updated copyright year and missing revision statement. No functional change. --- yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang b/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang index 9791ef4e3..c065a3698 100755 --- a/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang +++ b/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang @@ -14,10 +14,11 @@ module _3gpp-5gc-nrm-predefinedpccruleset { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "This IOC represents the predefined PCC rules, which are configured to SMF and referenced by PCF. - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-04-25 { reference CR-1520 ; } revision 2025-03-25 { reference CR-1489 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } -- GitLab From 694665e5fdbb421cb5c83d783300eb3fc0f77923 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Tue, 15 Apr 2025 15:02:21 +0200 Subject: [PATCH 35/94] Locally rebase and merge https://forge.3gpp.org/rep/sa5/MnS/-/merge_requests/1686 --- yang-models/_3gpp-common-subnetwork.yang | 33 +++++------------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang index 8f0b9787e..82a407e4e 100755 --- a/yang-models/_3gpp-common-subnetwork.yang +++ b/yang-models/_3gpp-common-subnetwork.yang @@ -21,7 +21,7 @@ module _3gpp-common-subnetwork { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines basic SubNetwork which will be augmented by other IOCs - Copyright 20254, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM) @@ -36,7 +36,7 @@ module _3gpp-common-subnetwork { 3GPP TS 28.620 Umbrella Information Model (UIM)"; - revision 2025-03-25 { reference "CR-0516"; } + revision 2025-03-25 { reference "CR-0516 CR-0527"; } revision 2024-11-19 { reference "Add STM"; } revision 2024-01-30 { reference CR-1337 ; } revision 2024-01-30 { reference CR-0328 ; } @@ -217,34 +217,13 @@ module _3gpp-common-subnetwork { list SubNetwork { key id; - description "Represents a set of managed entities"; + description "Represents a set of managed entities + Contained ManagedElements and SubNetworks shall be connected via + YANG Schema-mount."; uses top3gpp:Top_Grp; container attributes { uses SubNetworkGrp; - leaf-list parents { - description "Reference to all containg SubNetwork instances - in strict order from the root subnetwork down to the immediate - parent subnetwork. - If subnetworks form a containment hierarchy this is - modeled using references between the child SubNetwork and the parent - SubNetworks. - This reference MUST NOT be present for the top level SubNetwork and - MUST be present for other SubNetworks."; - type leafref { - path "../../../SubNetwork/id"; - } - } - - leaf-list containedChildren{ - description "Reference to all directly contained SubNetwork instances. - If subnetworks form a containment hierarchy this is - modeled using references between the child SubNetwork and the parent - SubNetwork."; - type leafref { - path "../../../SubNetwork/id"; - } - } } uses meas3gpp:MeasurementSubtree { @@ -288,7 +267,7 @@ module _3gpp-common-subnetwork { } yangmnt:mount-point children-of-SubNetwork { - description "Mountpoint for ManagedElement"; + description "Mountpoint for contained ManagedElements and SubNetworks"; reference "RFC8528 YANG Schema Mount"; } // augment external parts here -- GitLab From 0b4c8f92147720504d8f8310b181062115e4465f Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Tue, 15 Apr 2025 15:29:18 +0200 Subject: [PATCH 36/94] Locally rebase and merge https://forge.3gpp.org/rep/sa5/MnS/-/merge_requests/1642 --- .../_3gpp-common-subscription-control.yang | 32 +++++++++++++++++-- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang index 48aa7bb05..1bc0b418d 100755 --- a/yang-models/_3gpp-common-subscription-control.yang +++ b/yang-models/_3gpp-common-subscription-control.yang @@ -19,7 +19,7 @@ module _3gpp-common-subscription-control { Solution Set (SS) definitions 3GPP TS 28.623"; - revision 2025-03-24 { reference CR-0516 ; } + revision 2025-03-24 { reference "CR-0516 0518" ; } revision 2024-05-18 { reference CR-0359 ; } revision 2024-01-18 { reference "CR-0309 CR-0329" ; } revision 2023-09-18 { reference CR-0271 ; } @@ -111,6 +111,32 @@ module _3gpp-common-subscription-control { } } + typedef NotificationTypes { + description "An extensible enumeration of notification types"; + type union { + type enumeration { + enum notifyMOICreation; + enum notifyMOIDeletion; + enum notifyMOIAttributeValueChanges; + enum notifyMOIChanges; + enum notifyEvent; + enum notifyNewAlarm; + enum notifyChangedAlarm; + enum notifyAckStateChanged; + enum notifyComments; + enum notifyCorrelatedNotificationChanged; + enum notifyChangedAlarmGeneral; + enum notifyClearedAlarm; + enum notifyAlarmListRebuilt; + enum notifyPotentialFaultyAlarmList; + enum notifyFileReady; + enum notifyFilePreparationError; + enum notifyThresholdCrossing ; + } + type string; + } + } + grouping NtfSubscriptionControlGrp { description "Attributes of a specific notification subscription"; @@ -120,7 +146,7 @@ module _3gpp-common-subscription-control { } leaf-list notificationTypes { - type string; + type NotificationTypes; description "Defines the types of notifications that are candidates for being forwarded to the notification recipient. If the notificationTypes attribute is not supported or not present @@ -306,7 +332,7 @@ module _3gpp-common-subscription-control { description "Attributes of SupportedNotifications."; leaf-list notificationTypes { - type string; + type NotificationTypes; config false; description "List of notification types supported by the MnS producer"; } -- GitLab From c0916860d8ae8dcc5ae027d78c2d597a5c26b2fe Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Tue, 15 Apr 2025 15:58:06 +0200 Subject: [PATCH 37/94] Locally rebase and merge https://forge.3gpp.org/rep/sa5/MnS/-/merge_requests/1687 --- yang-models/_3gpp-5gc-nrm-amffunction.yang | 19 ++++++++++++++++--- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 5 ++++- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index c810e811d..4fe06e700 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -10,16 +10,17 @@ module _3gpp-5gc-nrm-amffunction { import ietf-inet-types { prefix inet; } import ietf-yang-types { prefix yang; } import _3gpp-common-top { prefix top3gpp; } + import _3gpp-nr-nrm-ntnfunction { prefix ntn3gpp; } organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "AMFFunction derived from basic ManagedFunction. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2025-03-25 { reference CR-1489 ; } + revision 2025-03-25 { reference "CR-1489 CR-1512" ; } revision 2024-11-01 { reference CR-1405; } revision 2024-10-06 { reference CR-1389; } revision 2024-04-04 { reference CR-1139; } @@ -455,7 +456,10 @@ module _3gpp-5gc-nrm-amffunction { } grouping AMFFunctionGrp { - description "Represents the AMFFunction IOC"; + description "Represents the AMFFunction IOC. + This IOC contains instances of NTNTimeBasedConfig to support + time-based configuration of the following NTN related entities: + AMFFunction and EP_N2."; uses mf3gpp:ManagedFunctionGrp; list pLMNInfoList { @@ -581,6 +585,15 @@ module _3gpp-5gc-nrm-amffunction { type types3gpp:DistinguishedName; description "This is the DN of AMFSet"; } + + list NTNTimeBasedConfig { + description "This is the NTN time-based configuration."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses ntn3gpp:NTNTimeBasedConfigGrp; + } + } } augment "/me3gpp:ManagedElement" { diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index 20dd62cf4..43e2a86eb 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -19,6 +19,7 @@ module _3gpp-nr-nrm-ntnfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-03-27 { reference CR-1512; } revision 2025-02-17 { reference CR-1479 ; } revision 2024-05-24 { reference CR-1273 ; } @@ -326,7 +327,9 @@ module _3gpp-nr-nrm-ntnfunction { NR access. This IOC contains instances of NTNTimeBasedConfig to support time-based configuration of the following NTN related entities: EP_NgC, NRCellCU, NRCellDU, NRSectorCarrier, SectorEquipmentFunction, - and NRCellRelation."; + and NRCellRelation. The IP Configuration of the feeder links may be + configured via IP Autoconfiguration services [x] and/or configured via + instances of NTNTimeBasedConfig in anticipation of feeder link switchovers."; key id; max-elements 1; uses top3gpp:Top_Grp; -- GitLab From c51663e434a1edd698cf0c45e845f9668b540ab1 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 28 Mar 2025 12:42:11 +0000 Subject: [PATCH 38/94] Update _3gpp-common-files.yang --- yang-models/_3gpp-common-files.yang | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-common-files.yang b/yang-models/_3gpp-common-files.yang index fb22a847a..cc0ba8f55 100644 --- a/yang-models/_3gpp-common-files.yang +++ b/yang-models/_3gpp-common-files.yang @@ -313,9 +313,13 @@ module _3gpp-common-files { the file data reporting MnS. When the file is not created at all or deleted, the 'objectClass' and 'objectInstance' parameters of the notification header are populated as described in 3GPP TS 28.532, - clause 11.6.1.1.1. Note that to receive 'notifyFilePreparationError' - in that case the notification subscription needs to include these - objects in its scope."; + clause 11.6.1.1.1. The parameter 'fileCreationErrorInfoList' + shall provide details about files and job which failed to create them. + The error information about such files shall only be emitted once, + at the time the MnS producer fails to create them, to inform the MnS + consumer about files which the node could not create. Note that to + receive 'notifyFilePreparationError' in that case the notification + subscription needs to include these objects in its scope."; key id; uses top3gpp:Top_Grp ; container attributes { -- GitLab From dd9d4a7cdf1a1e21f215e9a10f86727fbaf2568a Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Wed, 7 May 2025 10:00:06 +0200 Subject: [PATCH 39/94] alignment with Stage 2 RRMPolicy Name convation, from yaml CR S5-251972 --- yang-models/_3gpp-nr-nrm-rrmpolicy.yang | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-rrmpolicy.yang b/yang-models/_3gpp-nr-nrm-rrmpolicy.yang index aad5c5e9f..0d89212f6 100755 --- a/yang-models/_3gpp-nr-nrm-rrmpolicy.yang +++ b/yang-models/_3gpp-nr-nrm-rrmpolicy.yang @@ -26,7 +26,7 @@ module _3gpp-nr-nrm-rrmpolicy { revision 2020-04-28 { reference "CR0285"; } revision 2020-02-14 { reference "Initial revision"; } - grouping rRMPolicyMemberGrp { + grouping RRMPolicyMemberGrp { description "This data type represents an RRM Policy member that will be part of a rRMPolicyMemberList. A RRMPolicyMember is defined by its pLMNId and sNSSAI (S-NSSAI). @@ -70,7 +70,7 @@ module _3gpp-nr-nrm-rrmpolicy { the PLMNId <> and S-NSSAI <>." ; min-elements 1; key "mcc mnc sd sst"; - uses rRMPolicyMemberGrp; + uses RRMPolicyMemberGrp; } } // grouping @@ -114,7 +114,7 @@ module _3gpp-nr-nrm-rrmpolicy { } } - grouping RrmPolicySubtree { + grouping RRMPolicySubtree { description "Contains RrmPolicy related classes. Should be used in all classes (or classes inheriting from) - NRCellCU, NRCellDU, GNBCUUPFunction, GNBCUCPFunction, GNBDUFunction @@ -179,24 +179,24 @@ module _3gpp-nr-nrm-rrmpolicy { augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + "nrcellcu3gpp:NRCellCU" { - uses RrmPolicySubtree; + uses RRMPolicySubtree; } augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction/" + "nrcelldu3gpp:NRCellDU" { - uses RrmPolicySubtree; + uses RRMPolicySubtree; } augment "/me3gpp:ManagedElement/gnbcuup3gpp:GNBCUUPFunction" { - uses RrmPolicySubtree; + uses RRMPolicySubtree; } augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction" { - uses RrmPolicySubtree; + uses RRMPolicySubtree; } augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" { - uses RrmPolicySubtree; + uses RRMPolicySubtree; } } \ No newline at end of file -- GitLab From bd776abe10f534d963a516a9a8dfaa14c3a83f40 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Wed, 7 May 2025 11:19:05 +0200 Subject: [PATCH 40/94] update stage 3 to align VnfParameters and PeeParameters into datatypes --- .../_3gpp-common-managed-function.yang | 275 +++++++++--------- 1 file changed, 139 insertions(+), 136 deletions(-) diff --git a/yang-models/_3gpp-common-managed-function.yang b/yang-models/_3gpp-common-managed-function.yang index 8a012d09a..eeb4bfaf8 100755 --- a/yang-models/_3gpp-common-managed-function.yang +++ b/yang-models/_3gpp-common-managed-function.yang @@ -161,7 +161,131 @@ module _3gpp-common-managed-function { description "A user-friendly (and user assignable) name of this object."; } } - + grouping VnfParametersGrp { + description "This <> represents the parameter set of the VNF + instance(s) corresponding to an NE."; + + leaf vnfInstanceId { + type string ; + description "VNF instance identifier"; + reference "ETSI GS NFV-IFA 008 v2.1.1: + Network Functions Virtualisation (NFV); Management and Orchestration; + Ve-Vnfm reference point - Interface and Information Model Specification + section 9.4.2 + + ETSI GS NFV-IFA 015 v2.1.2: Network Functions Virtualisation (NFV); + Management and Orchestration; Report on NFV Information Model + section B2.4.2.1.2.3"; + } + + leaf vnfdId { + type string ; + description "Identifier of the VNFD on which the VNF instance is based. + The absence of the leaf or a string length of zero for vnfInstanceId + means the VNF instance(s) does not exist (e.g. has not been + instantiated yet, has already been terminated)."; + reference "ETSI GS NFV-IFA 008 v2.1.1: + Network Functions Virtualisation (NFV); Management and Orchestration; + Ve-Vnfm reference point - Interface and Information Model Specification + section 9.4.2"; + } + + leaf flavourId { + type string ; + description "Identifier of the VNF Deployment Flavour applied to this + VNF instance."; + reference "ETSI GS NFV-IFA 008 v2.1.1: + Network Functions Virtualisation (NFV) Management and Orchestration"; + } + + leaf autoScalable { + type boolean ; + mandatory true; + description "Indicator of whether the auto-scaling of this + VNF instance is enabled or disabled."; + } + } + + grouping PeeParametersGrp { + description "This <> represents the parameter list for the control + and monitoring of power, energy and environmental parameters of ManagedFunction + instance(s)."; + leaf idx { type uint32; } + leaf siteIdentification { + type string; + mandatory true; + description "The identification of the site where the + ManagedFunction resides."; + } + + leaf siteLatitude { + type decimal64 { + fraction-digits 4; + range "-90.0000..+90.0000"; + } + description "The latitude of the site where the ManagedFunction + instance resides, based on World Geodetic System (1984 version) + global reference frame (WGS 84). Positive values correspond to + the northern hemisphere. This attribute is optional + for BTSFunction, RNCFunction, GNBDUFunction and + NRSectorCarrier instance(s)."; + } + + leaf siteLongitude { + type decimal64 { + fraction-digits 4; + range "-180.0000..+180.0000"; + } + description "The longitude of the site where the ManagedFunction + instance resides, based on World Geodetic System (1984 version) + global reference frame (WGS 84). Positive values correspond to + degrees east of 0 degrees longitude. This attribute is optional + for BTSFunction, RNCFunction, GNBDUFunction and + NRSectorCarrier + instance(s)."; + } + + leaf siteAltitude { + type decimal64 { + fraction-digits 4; + } + description "The altitude of the site where the ManagedFunction + instance resides, in the unit of meter. This attribute is + optional for BTSFunction, RNCFunction, GNBDUFunction and + NRSectorCarrier instance(s)."; + } + + leaf siteDescription { + type string; + mandatory true; + description "An operator defined description of the site where + the ManagedFunction instance resides."; + } + + leaf equipmentType { + type string; + mandatory true; + description "The type of equipment where the managedFunction + instance resides."; + reference "clause 4.4.1 of ETSI ES 202 336-12"; + } + + leaf environmentType { + type string; + mandatory true; + description "The type of environment where the managedFunction + instance resides."; + reference "clause 4.4.1 of ETSI ES 202 336-12"; + } + + leaf powerInterface { + type string; + mandatory true; + description "The type of power."; + reference "clause 4.4.1 of ETSI ES 202 336-12"; + } + } + grouping ManagedFunctionGrp { description "Abstract root class to be inherited/reused by classes representing 3GPP functions. @@ -178,145 +302,24 @@ module _3gpp-common-managed-function { "; uses Function_Grp; - list vnfParametersList { - key vnfInstanceId; - description "Contains the parameter set of the VNF - instance(s) corresponding to an NE. - The presence of this list indicates that the ManagedFunction - represented is realized by one or more VNF instance(s). Otherwise it - shall be absent. - The presence of a vnfParametersList entry, whose vnfInstanceId with a - string length of zero, in createMO operation can trigger the - instantiation of the related VNF/VNFC instances."; - - leaf vnfInstanceId { - type string ; - description "VNF instance identifier"; - reference "ETSI GS NFV-IFA 008 v2.1.1: - Network Functions Virtualisation (NFV); Management and Orchestration; - Ve-Vnfm reference point - Interface and Information Model Specification - section 9.4.2 - - ETSI GS NFV-IFA 015 v2.1.2: Network Functions Virtualisation (NFV); - Management and Orchestration; Report on NFV Information Model - section B2.4.2.1.2.3"; - } - - leaf vnfdId { - type string ; - description "Identifier of the VNFD on which the VNF instance is based. - The absence of the leaf or a string length of zero for vnfInstanceId - means the VNF instance(s) does not exist (e.g. has not been - instantiated yet, has already been terminated)."; - reference "ETSI GS NFV-IFA 008 v2.1.1: - Network Functions Virtualisation (NFV); Management and Orchestration; - Ve-Vnfm reference point - Interface and Information Model Specification - section 9.4.2"; - } - - leaf flavourId { - type string ; - description "Identifier of the VNF Deployment Flavour applied to this - VNF instance."; - reference "ETSI GS NFV-IFA 008 v2.1.1: - Network Functions Virtualisation (NFV) Management and Orchestration"; - } - - leaf autoScalable { - type boolean ; - mandatory true; - description "Indicator of whether the auto-scaling of this - VNF instance is enabled or disabled."; - } + key "vnfInstanceId"; + uses VnfParametersGrp; + description "This attribute contains the parameter set of the VNF + instance(s) corresponding to an NE. The presence of this attribute + indicates that the ManagedFunction represented by the MOI is a + virtualized function "; } - - list peeParametersList { - key idx; - description "Contains the parameter set for the control - and monitoring of power, energy and environmental parameters of - ManagedFunction instance(s)."; - - leaf idx { type uint32; } - - leaf siteIdentification { - type string; - mandatory true; - description "The identification of the site where the - ManagedFunction resides."; - } - - leaf siteLatitude { - type decimal64 { - fraction-digits 4; - range "-90.0000..+90.0000"; - } - description "The latitude of the site where the ManagedFunction - instance resides, based on World Geodetic System (1984 version) - global reference frame (WGS 84). Positive values correspond to - the northern hemisphere. This attribute is optional - for BTSFunction, RNCFunction, GNBDUFunction and - NRSectorCarrier instance(s)."; - } - - leaf siteLongitude { - type decimal64 { - fraction-digits 4; - range "-180.0000..+180.0000"; - } - description "The longitude of the site where the ManagedFunction - instance resides, based on World Geodetic System (1984 version) - global reference frame (WGS 84). Positive values correspond to - degrees east of 0 degrees longitude. This attribute is optional - for BTSFunction, RNCFunction, GNBDUFunction and - NRSectorCarrier - instance(s)."; - } - - leaf siteAltitude { - type decimal64 { - fraction-digits 4; - } - description "The altitude of the site where the ManagedFunction - instance resides, in the unit of meter. This attribute is - optional for BTSFunction, RNCFunction, GNBDUFunction and - NRSectorCarrier instance(s)."; - } - - - leaf siteDescription { - type string; - mandatory true; - description "An operator defined description of the site where - the ManagedFunction instance resides."; - } - - leaf equipmentType { - type string; - mandatory true; - description "The type of equipment where the managedFunction - instance resides."; - reference "clause 4.4.1 of ETSI ES 202 336-12"; - } - - leaf environmentType { - type string; - mandatory true; - description "The type of environment where the managedFunction - instance resides."; - reference "clause 4.4.1 of ETSI ES 202 336-12"; - } - - leaf powerInterface { - type string; - mandatory true; - description "The type of power."; - reference "clause 4.4.1 of ETSI ES 202 336-12"; - } + list peeParameterslist{ + key "idx"; + uses PeeParametersGrp; + description "This attribute contains the parameter list for the control + and monitoring of power, energy and environmental parameters of + ManagedFunction instance(s). "; } - + leaf priorityLabel { - mandatory true; + mandatory false; type uint32; } -- GitLab From 4342d6d4bbb62e6057d06acf8d71cb30ade1f42d Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Wed, 7 May 2025 11:32:16 +0200 Subject: [PATCH 41/94] correct lint fault --- yang-models/_3gpp-common-managed-function.yang | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-common-managed-function.yang b/yang-models/_3gpp-common-managed-function.yang index eeb4bfaf8..7b39b6798 100755 --- a/yang-models/_3gpp-common-managed-function.yang +++ b/yang-models/_3gpp-common-managed-function.yang @@ -207,9 +207,9 @@ module _3gpp-common-managed-function { } grouping PeeParametersGrp { - description "This <> represents the parameter list for the control - and monitoring of power, energy and environmental parameters of ManagedFunction - instance(s)."; + description "This <> represents the parameter list for the + control and monitoring of power, energy and environmental parameters + of ManagedFunction instance(s)."; leaf idx { type uint32; } leaf siteIdentification { type string; @@ -319,7 +319,6 @@ module _3gpp-common-managed-function { } leaf priorityLabel { - mandatory false; type uint32; } -- GitLab From 6ffc720489934c7c40b18381a62b5f9119bdc40c Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Wed, 7 May 2025 12:18:06 +0200 Subject: [PATCH 42/94] add missing attributes isOnboardSatellite and onboardSatelliteId to GNBDUFunctionGrp in order to aligne with stage 2 --- yang-models/_3gpp-nr-nrm-gnbdufunction.yang | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang index 4932b44d8..c042f5403 100755 --- a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang @@ -18,6 +18,7 @@ module _3gpp-nr-nrm-gnbdufunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-05-07 { reference CR-1527; } revision 2025-02-05 { reference CR-1441; } revision 2024-02-24 { reference CR-1218; } revision 2023-09-18 { reference CR-1043 ; } @@ -185,7 +186,19 @@ module _3gpp-nr-nrm-gnbdufunction { information derived from the detected RIM-RS to OAM."; uses RimRSReportConfGrp; } - + leaf isOnboardSatellite { + type boolean; + mandatory false; + description "This attribute indicates whether the function is + on board the satellite."; + } + leaf onboardSatelliteId { + type string; + config false; + description "This attribute indicates the onboard satellite Id. + It shall be formatted as a fixed 5-digit string, padding with + leading digits “0” to complete a 5-digit length."; + } leaf configurable5QISetRef { type types3gpp:DistinguishedName; description "DN of the Configurable5QISet that the GNBDUFunction supports -- GitLab From 421ee6a04e47671d4197a3513ea7174efc9e1eae Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 7 May 2025 16:23:13 +0200 Subject: [PATCH 43/94] update to NRNetwork containment --- .../_3gpp-nr-nrm-externalamffunction.yang | 7 +- .../_3gpp-nr-nrm-externalgnbcucpfunction.yang | 48 +++++++++----- .../_3gpp-nr-nrm-externalgnbcuupfunction.yang | 48 +++++++++----- .../_3gpp-nr-nrm-externalgnbdufunction.yang | 58 ++++++++-------- .../_3gpp-nr-nrm-externalnrcellcu.yang | 66 ++++++++++--------- .../_3gpp-nr-nrm-externalupffunction.yang | 9 +-- yang-models/_3gpp-nr-nrm-nrfrequency.yang | 33 ++++------ yang-models/_3gpp-nr-nrm-nrnetwork.yang | 39 +++++------ 8 files changed, 165 insertions(+), 143 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-externalamffunction.yang b/yang-models/_3gpp-nr-nrm-externalamffunction.yang index eb0547390..94e984725 100755 --- a/yang-models/_3gpp-nr-nrm-externalamffunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalamffunction.yang @@ -5,7 +5,6 @@ module _3gpp-nr-nrm-externalamffunction { import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } - import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } @@ -16,6 +15,7 @@ module _3gpp-nr-nrm-externalamffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-04-25 { reference CR-1527 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { @@ -64,9 +64,4 @@ module _3gpp-nr-nrm-externalamffunction { if-feature subnet3gpp:ExternalsUnderSubNetwork ; uses ExternalAMFFunctionWrapper; } - - augment "/nrnet3gpp:NRNetwork" { - if-feature nrnet3gpp:ExternalsUnderNRNetwork; - uses ExternalAMFFunctionWrapper; - } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang index cbe2baff3..83941105a 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang @@ -5,40 +5,44 @@ module _3gpp-nr-nrm-externalgnbcucpfunction { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-nr-nrm-externalnrcellcu { prefix extnrcellcu3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the ExternalGNBCUCPFunction 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 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-04-25 { reference CR-1527 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalGNBCUCPFunctionGrp { description "Represets the ExternalGNBCUCPFunction IOC."; - reference "3GPP TS 28.541"; uses mf3gpp:ManagedFunctionGrp; leaf gNBId { - description "Identifies a gNB within a PLMN."; - reference "gNB Identifier (gNB ID) in 3GPP TS 38.300, Global gNB ID - in 3GPP TS 38.413"; + description "Identifies a gNB within a PLMN. + The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells. + + See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. + See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; mandatory true; - type int64 { range "0..4294967295"; } + type uint32 { range "0..4294967295"; } } leaf gNBIdLength { 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"; + reference "'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; mandatory true; type int32 { range "22..32"; } } @@ -57,23 +61,35 @@ module _3gpp-nr-nrm-externalgnbcucpfunction { list ExternalGNBCUCPFunction { description "Represents the properties, known by the management function, of a GNBCUCPFunction managed by another management function."; - reference "3GPP TS 28.541"; key id; uses top3gpp:Top_Grp; container attributes { uses ExternalGNBCUCPFunctionGrp; } uses mf3gpp:ManagedFunctionContainedClasses; + + uses extnrcellcu3gpp:ExternalNRCellCUSubtree; } } - augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; + feature ExternalGNBCUCPFunctionUnderNRNetwork { + description "The ExternalGNBCUCPFunction shall be contained under + NRNetwork"; + } + + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + "nrnet3gpp:NRNetwork" { + if-feature ExternalGNBCUCPFunctionUnderNRNetwork; uses ExternalGNBCUCPFunctionWrapper; } - augment "/nrnet3gpp:NRNetwork" { - if-feature nrnet3gpp:ExternalsUnderNRNetwork; + feature ExternalGNBCUCPFunctionUnderSubNetwork { + description "The ExternalGNBCUCPFunction shall be contained under + SubNetwork"; + } + + augment "/subnet3gpp:SubNetwork" { + if-feature ExternalGNBCUCPFunctionUnderSubNetwork ; uses ExternalGNBCUCPFunctionWrapper; - } + } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang index 2445a1e99..ac641a305 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang @@ -4,11 +4,14 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { prefix "extgnbcuup3gpp"; import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the ExternalGNBCUUPFunction Information Object Class (IOC), that is part of the NR Network Resource Model (NRM). @@ -16,11 +19,10 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-04-25 { reference CR-1527 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalGNBCUUPFunctionGrp { description "Represets the ExternalGNBCUUPFunction IOC."; @@ -28,26 +30,27 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { uses mf3gpp:ManagedFunctionGrp; leaf gNBId { - description "Identifies a gNB within a PLMN."; - reference "gNB Identifier (gNB ID) in 3GPP TS 38.300, Global gNB ID - in 3GPP TS 38.413"; + description "Identifies a gNB within a PLMN. + The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells. + + See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. + See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; mandatory true; - type int64 { range "0..4294967295"; } + type uint32 { range "0..4294967295"; } } leaf gNBIdLength { 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"; + reference "'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; mandatory true; type int32 { range "22..32"; } } } - grouping ExternalGNBCUUPFunctionWrapper { + grouping ExternalGNBCUUPFunctionSubtree { list ExternalGNBCUUPFunction { description "Represents the properties, known by the management function, of a GNBCUUPFunction managed by another management function."; - reference "3GPP TS 28.541"; key id; uses top3gpp:Top_Grp; container attributes { @@ -57,13 +60,24 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { } } - augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; - uses ExternalGNBCUUPFunctionWrapper; + feature ExternalGNBCUUPFunctionUnderNRNetwork { + description "The ExternalGNBCUUPFunction shall be contained under + NRNetwork"; + } + + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + "nrnet3gpp:NRNetwork" { + if-feature ExternalGNBCUUPFunctionUnderNRNetwork; + uses ExternalGNBCUUPFunctionSubtree; } - augment "/nrnet3gpp:NRNetwork" { - if-feature nrnet3gpp:ExternalsUnderNRNetwork; - uses ExternalGNBCUUPFunctionWrapper; - } + feature ExternalGNBCUUPFunctionUnderSubNetwork { + description "The ExternalGNBCUUPFunction shall be contained under + SubNetwork"; + } + + augment "/subnet3gpp:SubNetwork" { + if-feature ExternalGNBCUUPFunctionUnderSubNetwork ; + uses ExternalGNBCUUPFunctionSubtree; + } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang index 064b98db3..ac3c474fc 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang @@ -3,26 +3,27 @@ module _3gpp-nr-nrm-externalgnbdufunction { namespace "urn:3gpp:sa5:_3gpp-nr-nrm-externalgnbdufunction"; prefix "extgnbdu3gpp"; - import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the ExternalGNBDUFunction 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 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-04-25 { reference CR-1527 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalGNBDUFunctionGrp { description "Represets the ExternalGNBDUFunction IOC."; @@ -30,36 +31,28 @@ module _3gpp-nr-nrm-externalgnbdufunction { uses mf3gpp:ManagedFunctionGrp; leaf gNBId { - description "Identifies a gNB within a PLMN."; - reference "gNB Identifier (gNB ID) in 3GPP TS 38.300, Global gNB ID - in 3GPP TS 38.413"; + description "Identifies a gNB within a PLMN. + The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells. + + See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. + See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; mandatory true; - type int64 { range "0..4294967295"; } + type uint32 { range "0..4294967295"; } yext3gpp:inVariant; } leaf gNBIdLength { 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"; + reference "'Global gNB ID' in subclause 9.3.1.6 of TS 38.413"; mandatory true; type int32 { range "22..32"; } } - - list pLMNId { - description "Specifies the PLMN identifier to be used as part of the - global RAN node identity."; - key "mcc mnc"; - min-elements 1; - max-elements 1; - uses types3gpp:PLMNId; - } } - grouping ExternalGNBDUFunctionWrapper { + grouping ExternalGNBDUFunctionSubtree { list ExternalGNBDUFunction { description "Represents the properties, known by the management function, of a GNBDUFunction managed by another management function."; - reference "3GPP TS 28.541"; key id; uses top3gpp:Top_Grp; container attributes { @@ -69,13 +62,24 @@ module _3gpp-nr-nrm-externalgnbdufunction { } } - augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; - uses ExternalGNBDUFunctionWrapper; + feature ExternalGNBDUFunctionUnderNRNetwork { + description "The ExternalGNBDUFunction shall be contained under + NRNetwork"; + } + + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + "nrnet3gpp:NRNetwork" { + if-feature ExternalGNBDUFunctionUnderNRNetwork; + uses ExternalGNBDUFunctionSubtree; } - augment "/nrnet3gpp:NRNetwork" { - if-feature nrnet3gpp:ExternalsUnderNRNetwork; - uses ExternalGNBDUFunctionWrapper; + feature ExternalGNBDUFunctionUnderSubNetwork { + description "The ExternalGNBDUFunction shall be contained under + SubNetwork"; + } + + augment "/subnet3gpp:SubNetwork" { + if-feature ExternalGNBDUFunctionUnderSubNetwork ; + uses ExternalGNBDUFunctionSubtree; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang b/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang index b982aa12c..ab1a142c2 100755 --- a/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang +++ b/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang @@ -5,43 +5,57 @@ module _3gpp-nr-nrm-externalnrcellcu { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } - import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } - import _3gpp-common-subnetwork { prefix subnet3gpp; } - import _3gpp-nr-nrm-externalgnbcucpfunction { prefix extgnbcucp3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the ExternalNRCellCU 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 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-04-25 { reference CR-1527 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalNRCellCUGrp { description "Represents the ExternalNRCellCU IOC."; - reference "3GPP TS 28.541"; uses mf3gpp:ManagedFunctionGrp; - leaf cellLocalId { - description "Identifies an NR cell of a gNB. Together with corresponding - gNB ID it forms the NR Cell Identifier (NCI)."; - reference "NCI in 3GPP TS 38.300"; + leaf cellLocalId { + description "It identifies a NR cell of a gNB. + + It, together with the gNB Identifier (using gNBId of the parent + GNBCUCPFunction or GNBDUFunction or OperatorDU (for MOCN network + sharing scenario) or ExternalCUCPFunction), identifies a NR cell within + a PLMN. This is the NR Cell Identity(NCI). See subclause 8.2 of TS38.300. + + The NCI can be constructed by encoding the gNB Identifier using gNBId + (of the parent GNBCUCPFunction or GNBDUFunction or OperatorDU + (for MOCN network sharing scenario) or ExternalCUCPFunction) and + cellLocalId where the gNB Identifier field is of length specified by + gNBIdLength (of the parent GNBCUCPFunction or GNBDUFunction or + ExternalCUCPFunction). See 'Global gNB ID' in subclause 9.3.1.6 of + TS 38.413. + + The NR Cell Global identifier (NCGI) is constructed from the + PLMN identity the cell belongs to and the NR Cell Identifier (NCI) of + the cell. + + See relation between NCI and NCGI subclause 8.2 of TS 38.300 "; mandatory true; - type int32 {range "0..16383"; } + type int32; } leaf nRPCI { - description "The Physical Cell Identity (PCI) of the NR cell."; - reference "3GPP TS 36.211"; + description "This holds the Physical Cell Identity (PCI) of the NR cell. + + allowedValues: + See 3GPP TS 36.211 subclause 6.11 for legal values of pci."; mandatory true; - type int32 { range "0..1007"; } + type int64; } list pLMNIdList { @@ -62,11 +76,11 @@ module _3gpp-nr-nrm-externalnrcellcu { } } - grouping ExternalNRCellCUWrapper { + grouping ExternalNRCellCUSubtree { list ExternalNRCellCU { - description "Represents the properties of an NRCellCU controlled by - another Management Service Provider."; - reference "3GPP TS 28.541"; + description "This IOC contains necessary attributes for inter-system + and intra-system handover. It also contains a subset of the attributes + of related IOCs controlled by Management Service Provider."; key id; uses top3gpp:Top_Grp; container attributes { @@ -75,14 +89,4 @@ module _3gpp-nr-nrm-externalnrcellcu { uses mf3gpp:ManagedFunctionContainedClasses; } } - - augment "/subnet3gpp:SubNetwork/extgnbcucp3gpp:ExternalGNBCUCPFunction" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; - uses ExternalNRCellCUWrapper; - } - - augment "/nrnet3gpp:NRNetwork/extgnbcucp3gpp:ExternalGNBCUCPFunction" { - if-feature nrnet3gpp:ExternalsUnderNRNetwork; - uses ExternalNRCellCUWrapper; - } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalupffunction.yang b/yang-models/_3gpp-nr-nrm-externalupffunction.yang index 11e924dab..8c0bbf0c4 100755 --- a/yang-models/_3gpp-nr-nrm-externalupffunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalupffunction.yang @@ -4,8 +4,8 @@ module _3gpp-nr-nrm-externalupffunction { prefix "extupf3gpp"; import _3gpp-common-managed-function { prefix mf3gpp; } - import _3gpp-common-subnetwork { prefix subnet3gpp; } - import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } + /*import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; }*/ import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; @@ -15,6 +15,7 @@ module _3gpp-nr-nrm-externalupffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-04-25 { reference CR-1527 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { @@ -42,7 +43,7 @@ module _3gpp-nr-nrm-externalupffunction { } } - augment "/subnet3gpp:SubNetwork" { + /*augment "/subnet3gpp:SubNetwork" { if-feature subnet3gpp:ExternalsUnderSubNetwork ; uses ExternalUPFFunctionWrapper; } @@ -50,5 +51,5 @@ module _3gpp-nr-nrm-externalupffunction { augment "/nrnet3gpp:NRNetwork" { if-feature nrnet3gpp:ExternalsUnderNRNetwork; uses ExternalUPFFunctionWrapper; - } + }*/ } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-nrfrequency.yang b/yang-models/_3gpp-nr-nrm-nrfrequency.yang index 5564721df..515e8300c 100755 --- a/yang-models/_3gpp-nr-nrm-nrfrequency.yang +++ b/yang-models/_3gpp-nr-nrm-nrfrequency.yang @@ -3,9 +3,9 @@ module _3gpp-nr-nrm-nrfrequency { namespace "urn:3gpp:sa5:_3gpp-nr-nrm-nrfrequency"; prefix "nrfreq3gpp"; - import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } - import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; @@ -16,18 +16,14 @@ module _3gpp-nr-nrm-nrfrequency { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-04-25 { reference CR-1527 ; } revision 2025-01-25 { reference CR-1442 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - reference "Initial version"; - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial version"; } grouping NRFrequencyGrp { description "Represents the NRFrequency IOC."; - reference "3GPP TS 28.541"; - uses mf3gpp:ManagedFunctionGrp; leaf absoluteFrequencySSB { description "The absolute frequency applicable for a downlink NR carrier @@ -37,17 +33,19 @@ module _3gpp-nr-nrm-nrfrequency { } leaf ssBSubCarrierSpacing { - description "Sub-carrier spacing of the SSB."; + description "Sub-carrier spacing of the SSB. + Note that the allowed values of SSB used for representing data, + by e.g. a BWP, are: 15, 30, 60 and 120 in units of kHz."; mandatory true; - type uint8 { range "15 | 30 | 60 | 120"; } + type uint8 { range "15 | 30 | 60 | 120 | 240"; } units "kHz"; } - leaf-list multiFrequencyBandListNR { + leaf multiFrequencyBandListNR { description "List of additional frequency bands the frequency belongs to. The list is automatically set by the gNB."; + mandatory true; config false; - min-elements 1; type uint16 { range "1..256"; } } } @@ -55,23 +53,16 @@ module _3gpp-nr-nrm-nrfrequency { grouping NRFrequencyWrapper { list NRFrequency { description "Represents certain NR frequency properties."; - reference "3GPP TS 28.541"; key id; uses top3gpp:Top_Grp; container attributes { uses NRFrequencyGrp; } - uses mf3gpp:ManagedFunctionContainedClasses; } } - augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; - uses NRFrequencyWrapper; - } - - augment "/nrnet3gpp:NRNetwork" { - if-feature nrnet3gpp:ExternalsUnderNRNetwork; + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + "nrnet3gpp:NRNetwork" { uses NRFrequencyWrapper; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-nrnetwork.yang b/yang-models/_3gpp-nr-nrm-nrnetwork.yang index 9e622884d..c1cf0952a 100755 --- a/yang-models/_3gpp-nr-nrm-nrnetwork.yang +++ b/yang-models/_3gpp-nr-nrm-nrnetwork.yang @@ -3,40 +3,37 @@ module _3gpp-nr-nrm-nrnetwork { namespace "urn:3gpp:sa5:_3gpp-nr-nrm-nrnetwork"; prefix "nrnet3gpp"; - import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the NRNetwork 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 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-04-25 { reference CR-1527 ; } revision 2023-09-18 { reference CR-1043 ; } - revision 2019-06-17 { - description "Initial revision"; - } - - feature ExternalsUnderNRNetwork { - description "Classes representing external entities like NRFrequency, - ExternalGNBCUCPFunction, ExternalGNBDUFunction - are contained under a NRNetwork list/class."; - } + revision 2019-06-17 { reference "Initial revision"; } grouping NRNetworkGrp { - description "Represents the NRNetwork IOC."; - reference "3GPP TS 28.541"; - uses subnet3gpp:SubNetworkGrp; + description "Represents the NRNetwork IOC. + Contains no additiona attributes."; } - list NRNetwork { - description "A subnetwork containing gNB external NR entities."; - reference "3GPP TS 28.541"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses NRNetworkGrp; + augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction { + list NRNetwork { + description "Represents a set of NR frequencies and external NR entities + (e.g. ExternalGNBCUCPFunction). This is used to differentiate these + entities and frequencies from those in EUTRAN."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses NRNetworkGrp; + } } } } \ No newline at end of file -- GitLab From 96e8e51787af19e93fb4ea3a9af15617134b6cf4 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 7 May 2025 17:37:12 +0200 Subject: [PATCH 44/94] removed duplicate yext3gpp:inVariant --- yang-models/_3gpp-common-trace.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 2ec6b33ea..fdf40d044 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -25,6 +25,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; + revision 2025-05-07 { reference "CR-0532" ; } revision 2025-02-07 { reference "CR-0504" ; } revision 2025-02-05 { reference "CR-0461" ; } revision 2024-11-25 { reference "CR-0492" ; } @@ -1749,7 +1750,6 @@ module _3gpp-common-trace { type string; yext3gpp:inVariant; description "Identifier of a TraceJob"; - yext3gpp:inVariant; } leaf traceReportingFormat { -- GitLab From c5f5c045b1d7cf0d48bfa57192596c546c120219 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 7 May 2025 22:29:44 +0200 Subject: [PATCH 45/94] corrected operatorDU and EP_F1C/U containment except externals --- yang-models/_3gpp-nr-nrm-ep.yang | 79 ++++++++++-------------- yang-models/_3gpp-nr-nrm-operatordu.yang | 13 +++- 2 files changed, 42 insertions(+), 50 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ep.yang b/yang-models/_3gpp-nr-nrm-ep.yang index 927bc49b1..9ba368b9f 100755 --- a/yang-models/_3gpp-nr-nrm-ep.yang +++ b/yang-models/_3gpp-nr-nrm-ep.yang @@ -15,10 +15,11 @@ module _3gpp-nr-nrm-ep { description "Defines the YANG mapping of the NR related endpoint Information Object Classes (IOCs) that are part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-05-07 { reference CR-1527 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2022-01-07 { reference CR-0643; } revision 2021-05-01 { reference CR-0490; } @@ -46,16 +47,30 @@ module _3gpp-nr-nrm-ep { uses eprp3gpp:EP_Common; } - grouping EP_F1CGrp { - description "Represents the EP_F1C IOC."; - reference "3GPP TS 28.541, 3GPP TS 38.470"; - uses eprp3gpp:EP_Common; + grouping EP_F1CSubtree { + list EP_F1C { + description "Represents the local end point of the control plane + interface (F1-C) between the gNB-DU and gNB-CU or gNB-CU-CP."; + reference "3GPP TS 28.541, 3GPP TS 38.470"; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses eprp3gpp:EP_Common; + } + } } - grouping EP_F1UGrp { - description "Represents the EP_F1U IOC."; - reference "3GPP TS 28.541, 3GPP TS 38.470"; - uses eprp3gpp:EP_Common; + grouping EP_F1USubtree { + list EP_F1U { + description "Represents the local end point of the user plane + interface (F1-U) between the gNB-DU and gNB-CU or gNB-CU-UP."; + reference "3GPP TS 28.541, 3GPP TS 38.470"; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses eprp3gpp:EP_Common; + } + } } grouping EP_XnCGrp { @@ -114,16 +129,7 @@ module _3gpp-nr-nrm-ep { } } - list EP_F1C { - description "Represents the local end point of the control plane - interface (F1-C) between the gNB-DU and gNB-CU or gNB-CU-CP."; - reference "3GPP TS 28.541, 3GPP TS 38.470"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses EP_F1CGrp; - } - } + uses EP_F1CSubtree; list EP_NgC { description "Represents the local end point of the control plane @@ -176,16 +182,7 @@ module _3gpp-nr-nrm-ep { } } - list EP_F1U { - description "Represents the local end point of the user plane - interface (F1-U) between the gNB-DU and gNB-CU or gNB-CU-UP."; - reference "3GPP TS 28.541, 3GPP TS 38.470"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses EP_F1UGrp; - } - } + uses EP_F1USubtree; list EP_NgU { description "Represents the local end point of the NG user plane @@ -236,26 +233,12 @@ module _3gpp-nr-nrm-ep { augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" { if-feature EPClassesUnderGNBDUFunction; - list EP_F1C { - description "Represents the local end point of the control plane - interface (F1-C) between the DU and CU or CU-CP."; - reference "3GPP TS 28.541, 3GPP TS 38.470"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses EP_F1CGrp; - } - } - - list EP_F1U { - description "Represents the local end point of the user plane - interface (F1-U) between the DU and CU or CU-UP."; - reference "3GPP TS 28.541, 3GPP TS 38.470"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses EP_F1UGrp; + uses EP_F1CSubtree { + refine EP_F1C { + max-elements 1; } } + + uses EP_F1USubtree; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-operatordu.yang b/yang-models/_3gpp-nr-nrm-operatordu.yang index 98a702b77..d5bc4ded1 100755 --- a/yang-models/_3gpp-nr-nrm-operatordu.yang +++ b/yang-models/_3gpp-nr-nrm-operatordu.yang @@ -7,15 +7,17 @@ module _3gpp-nr-nrm-operatordu { import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-nr-nrm-gnbdufunction {prefix gnbdu3gpp; } import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-nr-nrm-ep { prefix ep3gpp; } organization "3GPP SA5"; 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 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-05-07 { reference CR-1527; } revision 2024-02-24 { reference CR-1218; } revision 2023-11-14 { reference "CR1136"; } revision 2023-09-30 { reference "CR1048"; } @@ -76,7 +78,14 @@ module _3gpp-nr-nrm-operatordu { container attributes { uses OperatorDUGrp; } - uses gnbdu3gpp:GNBDUFunctionGrp; + + uses ep3gpp:EP_F1CSubtree { + refine EP_F1C { + max-elements 1; + } + } + + uses ep3gpp:EP_F1USubtree; } } } \ No newline at end of file -- GitLab From 6d0374a8f7b92d355b432868c0cf8aa9723ab34f Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 7 May 2025 22:55:06 +0200 Subject: [PATCH 46/94] updated CR numbers for common r18,19 files --- yang-models/_3gpp-nr-nrm-ep.yang | 2 +- yang-models/_3gpp-nr-nrm-operatordu.yang | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ep.yang b/yang-models/_3gpp-nr-nrm-ep.yang index 9ba368b9f..60bc8091f 100755 --- a/yang-models/_3gpp-nr-nrm-ep.yang +++ b/yang-models/_3gpp-nr-nrm-ep.yang @@ -19,7 +19,7 @@ module _3gpp-nr-nrm-ep { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2025-05-07 { reference CR-1527 ; } + revision 2025-05-06 { reference "CR-1526 CR-1527" ; } // common for R18, R19 revision 2023-09-18 { reference CR-1043 ; } revision 2022-01-07 { reference CR-0643; } revision 2021-05-01 { reference CR-0490; } diff --git a/yang-models/_3gpp-nr-nrm-operatordu.yang b/yang-models/_3gpp-nr-nrm-operatordu.yang index d5bc4ded1..f50f7873a 100755 --- a/yang-models/_3gpp-nr-nrm-operatordu.yang +++ b/yang-models/_3gpp-nr-nrm-operatordu.yang @@ -17,7 +17,7 @@ module _3gpp-nr-nrm-operatordu { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2025-05-07 { reference CR-1527; } + revision 2025-05-06 { reference "CR-1526 CR-1527" ; } // common for R18, R19 revision 2024-02-24 { reference CR-1218; } revision 2023-11-14 { reference "CR1136"; } revision 2023-09-30 { reference "CR1048"; } -- GitLab From 45ad6ea60b889d0bcf814775ffb3b55336e73d3b Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 7 May 2025 23:20:57 +0200 Subject: [PATCH 47/94] Remove unneeded nroperatorcelldu --- yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang b/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang index 42afcf248..b4d490fbb 100755 --- a/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang +++ b/yang-models/_3gpp-nr-nrm-nroperatorcelldu.yang @@ -14,10 +14,11 @@ module _3gpp-nr-nrm-nroperatorcelldu { 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 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-05-06 { reference "CR-1526 CR-1527" ; } // common for R18, R19 revision 2024-05-24 { reference CR-1273 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2021-10-01 { reference "Initial revision"; } @@ -79,7 +80,6 @@ module _3gpp-nr-nrm-nroperatorcelldu { container attributes { uses NROperatorCellDUGrp; } - uses gnbdu3gpp:GNBDUFunctionGrp; } } } \ No newline at end of file -- GitLab From 0d4589b75042bbc6af4672620c3989a88a768dbc Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 7 May 2025 23:43:56 +0200 Subject: [PATCH 48/94] removed unneeded idx leaf from NRECMappingRule --- yang-models/_3gpp-nr-nrm-ecmappingrule.yang | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang index ac5fbfe30..00f44bc9a 100644 --- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang +++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang @@ -13,7 +13,8 @@ module _3gpp-nr-nrm-ecmappingrule { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - revision 2024-08-21 { reference CR-1337 ; } + revision 2025-05-06 { reference "CR-1526 CR-1527" ; } // common for R18, R19 + revision 2024-08-12 { reference "CR-1336 CR-1337"; } grouping NRECMappingRuleGrp { description "Represents the unified mapping rule to support Energy Cost Mapping @@ -43,11 +44,16 @@ module _3gpp-nr-nrm-ecmappingrule { grouping NRECMappingRuleSubtree { description "Helps augmenting NRECMappingRule into multiple places."; list NRECMappingRule { + description "Represents the unified mapping rule, applicable for the + group of gNBs (within a certain area), for the calculation of the + energy cost (see TS 34.423). + + NRECMappingRule can be name-contained by SubNetwork or ManagedElement. + It applies to all ManagedEntity contained by the parent."; key id; uses top3gpp:Top_Grp; min-elements 1; max-elements 1; - leaf idx { type uint32; } container attributes { uses NRECMappingRuleGrp; } -- GitLab From d3da9df543cf5dade7455ecbe11436c0ef9fab5a Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 7 May 2025 23:57:18 +0200 Subject: [PATCH 49/94] corrected DANRManagementFunction --- yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang b/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang index 3260d3646..5dbbc4e4f 100755 --- a/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang +++ b/yang-models/_3gpp-nr-nrm-danrmanagementfunction.yang @@ -11,10 +11,11 @@ module _3gpp-nr-nrm-danrmanagementfunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; 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, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-05-06 { reference "CR-1526 CR-1527" ; } // common for R18, R19 revision 2024-08-19 { reference CR-1314 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2020-05-08 { reference S5-203316; } @@ -40,6 +41,7 @@ module _3gpp-nr-nrm-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; + max-elements 1; uses top3gpp:Top_Grp; container attributes { uses DANRManagementFunctionGrp; -- GitLab From 8f3e53c20ee1c2fdea40a3bc5e06fb82b6296a96 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 8 May 2025 03:31:24 +0200 Subject: [PATCH 50/94] corrected eutranetwork containment, and its underlying IOCs step1 --- yang-models/_3gpp-nr-nrm-eutranetwork.yang | 57 +++++-------------- yang-models/_3gpp-nr-nrm-eutranfrequency.yang | 23 +++----- .../_3gpp-nr-nrm-externalamffunction.yang | 4 +- .../_3gpp-nr-nrm-externalenbfunction.yang | 25 ++++---- .../_3gpp-nr-nrm-externaleutrancell.yang | 35 ++---------- ...3gpp-nr-nrm-externalservinggwfunction.yang | 5 +- .../_3gpp-nr-nrm-externalupffunction.yang | 1 + 7 files changed, 49 insertions(+), 101 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-eutranetwork.yang b/yang-models/_3gpp-nr-nrm-eutranetwork.yang index 3958b9c1a..7a1e01278 100755 --- a/yang-models/_3gpp-nr-nrm-eutranetwork.yang +++ b/yang-models/_3gpp-nr-nrm-eutranetwork.yang @@ -3,62 +3,35 @@ module _3gpp-nr-nrm-eutranetwork { namespace "urn:3gpp:sa5:_3gpp-nr-nrm-eutranetwork"; prefix "eutranet3gpp"; - import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the EUtraNetwork Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-04-25 { reference CR-1527 ; } revision 2023-09-18 { reference CR-1043 ; } - revision 2019-06-17 { - description "Initial revision"; - } - - feature ExternalsUnderEUtraNetwork { - description "Classes representing external entities like EUtranFrequency, - ExternalENBFunction are contained under a EUtraNetwork list/class."; - } + revision 2019-06-17 {reference "Initial revision"; } grouping EUtraNetworkGrp { - description "Represents the EUtraNetwork IOC."; - reference "3GPP TS 28.541"; - uses subnet3gpp:SubNetworkGrp; + description "Represents the EUtraNetwork IOC. + Contains no additiona attributes."; } - list EUtraNetwork { - description "A subnetwork containing gNB external E-UTRAN entities."; - reference "3GPP TS 28.541"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses EUtraNetworkGrp; - leaf-list parents { - description "Reference to all containg EUtraNetwork instances - in strict order from the root EUtraNetwork down to the immediate - parent EUtraNetwork. - If EUtraNetworks form a containment hierarchy this is - modeled using references between the child EUtraNetwork and the parent - EUtraNetworks. - This reference MUST NOT be present for the top level EUtraNetwork and - MUST be present for other EUtraNetworks."; - type leafref { - path "../../../EUtraNetwork/id"; - } - } - - leaf-list containedChildren{ - description "Reference to all directly contained EUtraNetwork instances. - If EUtraNetworks form a containment hierarchy this is - modeled using references between the child EUtraNetwork and the parent - EUtraNetwork."; - type leafref { - path "../../../EUtraNetwork/id"; - } - } + augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction { + list EUtraNetwork { + description "A subnetwork containing gNB external E-UTRAN entities."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses EUtraNetworkGrp; + } } } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-eutranfrequency.yang b/yang-models/_3gpp-nr-nrm-eutranfrequency.yang index 0698485b4..57a75adbc 100755 --- a/yang-models/_3gpp-nr-nrm-eutranfrequency.yang +++ b/yang-models/_3gpp-nr-nrm-eutranfrequency.yang @@ -3,29 +3,28 @@ module _3gpp-nr-nrm-eutranfrequency { namespace "urn:3gpp:sa5:_3gpp-nr-nrm-eutranfrequency"; prefix "eutraneteutranfreq3gpp"; - import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; } - import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the EUtranFrequency 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 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM), 3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)"; + revision 2025-04-25 { reference CR-1527 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping EUtranFrequencyGrp { description "Represents the EUtranFrequency IOC."; reference "3GPP TS 28.541"; - uses mf3gpp:ManagedFunctionGrp; leaf earfcnDL { description "Specifies the channel number for the central DL frequency."; @@ -51,17 +50,11 @@ module _3gpp-nr-nrm-eutranfrequency { container attributes { uses EUtranFrequencyGrp; } - uses mf3gpp:ManagedFunctionContainedClasses; } } - augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; - uses EUtranFrequencyWrapper ; - } - - augment "/eutranet3gpp:EUtraNetwork" { - if-feature eutranet3gpp:ExternalsUnderEUtraNetwork; + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + "eutranet3gpp:EUtraNetwork" { uses EUtranFrequencyWrapper ; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalamffunction.yang b/yang-models/_3gpp-nr-nrm-externalamffunction.yang index 94e984725..14284129f 100755 --- a/yang-models/_3gpp-nr-nrm-externalamffunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalamffunction.yang @@ -9,9 +9,10 @@ module _3gpp-nr-nrm-externalamffunction { import _3gpp-common-yang-types { prefix types3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the ExternalAMFFunction 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 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; @@ -61,7 +62,6 @@ module _3gpp-nr-nrm-externalamffunction { } augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; uses ExternalAMFFunctionWrapper; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalenbfunction.yang b/yang-models/_3gpp-nr-nrm-externalenbfunction.yang index cdb1611c4..f40ebe145 100755 --- a/yang-models/_3gpp-nr-nrm-externalenbfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalenbfunction.yang @@ -4,24 +4,26 @@ module _3gpp-nr-nrm-externalenbfunction { prefix "extenb3gpp"; import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; } - import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-nr-nrm-externaleutrancell { prefix exteutrancell3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the ExternalENBFunction 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 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM), 3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)"; + revision 2025-04-25 { reference CR-1527 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalENBFunctionGrp { description "Represets the ExternalENBFunction IOC."; @@ -48,16 +50,19 @@ module _3gpp-nr-nrm-externalenbfunction { uses ExternalENBFunctionGrp; } uses mf3gpp:ManagedFunctionContainedClasses; + uses exteutrancell3gpp:ExternalEUtranCellFDDSubtree; + uses exteutrancell3gpp:ExternalEUtranCellTDDSubtree; } } - augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalsUnderSubNetwork ; + /*augment "/subnet3gpp:SubNetwork" { + if-feature subnet3gpp:ExternalENBFunctionUnderSubNetwork ; uses ExternalENBFunctionWrapper; - } + }*/ - augment "/eutranet3gpp:EUtraNetwork" { - if-feature eutranet3gpp:ExternalsUnderEUtraNetwork; + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + "eutranet3gpp:EUtraNetwork" { + //if-feature eutranet3gpp:ExternalENBFunctionUnderEUtraNetwork; uses ExternalENBFunctionWrapper; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externaleutrancell.yang b/yang-models/_3gpp-nr-nrm-externaleutrancell.yang index d3306bc8c..2e09e4e44 100755 --- a/yang-models/_3gpp-nr-nrm-externaleutrancell.yang +++ b/yang-models/_3gpp-nr-nrm-externaleutrancell.yang @@ -5,25 +5,22 @@ module _3gpp-nr-nrm-externaleutrancell { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; } - import _3gpp-common-subnetwork { prefix subnet3gpp; } - import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; } - import _3gpp-nr-nrm-externalenbfunction { prefix extenb3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the ExternalEUtranCellFDD and ExternalEUtranCellTDD Information Object Classes (IOCs) that are part of the NR Network Resource Model (NRM). - Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM), 3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)"; + revision 2025-04-25 { reference CR-1527 ; } revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalEUtranGenericCellGrp { description "Represents the ExternalEUtranGenericCell IOC."; @@ -106,7 +103,7 @@ module _3gpp-nr-nrm-externaleutrancell { } } - grouping ExternalEUtranCellFDDWrapper { + grouping ExternalEUtranCellFDDSubtree { list ExternalEUtranCellFDD { description "Represents the common properties of external E-UTRAN FDD cell provided by eNB or NG-RAN FDD cell provided by ng-eNB."; @@ -120,7 +117,7 @@ module _3gpp-nr-nrm-externaleutrancell { } } - grouping ExternalEUtranCellTDDWrapper { + grouping ExternalEUtranCellTDDSubtree { list ExternalEUtranCellTDD { description "Represents the common properties of external E-UTRAN cell TDD provided by eNB or NG-RAN TDD cell provided by ng-eNB."; @@ -133,24 +130,4 @@ module _3gpp-nr-nrm-externaleutrancell { uses mf3gpp:ManagedFunctionContainedClasses; } } - - augment "/subnet3gpp:SubNetwork/extenb3gpp:ExternalENBFunction" { - if-feature subnet3gpp:ExternalsUnderSubNetwork; - uses ExternalEUtranCellFDDWrapper; - } - - augment "/eutranet3gpp:EUtraNetwork/extenb3gpp:ExternalENBFunction" { - if-feature eutranet3gpp:ExternalsUnderEUtraNetwork; - uses ExternalEUtranCellFDDWrapper; - } - - augment "/subnet3gpp:SubNetwork/extenb3gpp:ExternalENBFunction" { - if-feature subnet3gpp:ExternalsUnderSubNetwork; - uses ExternalEUtranCellTDDWrapper; - } - - augment "/eutranet3gpp:EUtraNetwork/extenb3gpp:ExternalENBFunction" { - if-feature eutranet3gpp:ExternalsUnderEUtraNetwork; - uses ExternalEUtranCellTDDWrapper; - } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang b/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang index 1fd046946..3b2052cdd 100755 --- a/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang @@ -5,7 +5,6 @@ module _3gpp-nr-nrm-externalservinggwfunction { import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } - import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; @@ -48,8 +47,8 @@ module _3gpp-nr-nrm-externalservinggwfunction { uses ExternalServingGWFunctionWrapper; } - augment "/eutranet3gpp:EUtraNetwork" { + /*augment "/eutranet3gpp:EUtraNetwork" { if-feature eutranet3gpp:ExternalsUnderEUtraNetwork; uses ExternalServingGWFunctionWrapper; - } + }*/ } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalupffunction.yang b/yang-models/_3gpp-nr-nrm-externalupffunction.yang index 8c0bbf0c4..044358beb 100755 --- a/yang-models/_3gpp-nr-nrm-externalupffunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalupffunction.yang @@ -9,6 +9,7 @@ module _3gpp-nr-nrm-externalupffunction { import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the ExternalUPFFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, -- GitLab From 2705ad545a0c341402202bb8552bebbf5407d9fc Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 19 May 2025 16:15:15 +0900 Subject: [PATCH 51/94] change ExternalEnbFunction containment --- .../_3gpp-nr-nrm-externalenbfunction.yang | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-externalenbfunction.yang b/yang-models/_3gpp-nr-nrm-externalenbfunction.yang index f40ebe145..971a8a1f8 100755 --- a/yang-models/_3gpp-nr-nrm-externalenbfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalenbfunction.yang @@ -4,6 +4,7 @@ module _3gpp-nr-nrm-externalenbfunction { prefix "extenb3gpp"; import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; } @@ -55,14 +56,24 @@ module _3gpp-nr-nrm-externalenbfunction { } } - /*augment "/subnet3gpp:SubNetwork" { - if-feature subnet3gpp:ExternalENBFunctionUnderSubNetwork ; + feature ExternalENBFunctionUnderSubNetwork { + description "The ExternalENBFunction shall be contained under + SubNetwork"; + } + + augment "/subnet3gpp:SubNetwork" { + if-feature ExternalENBFunctionUnderSubNetwork ; uses ExternalENBFunctionWrapper; - }*/ + } + feature ExternalENBFunctionUnderEUtraNetwork { + description "The ExternalENBFunction shall be contained under + EUtraNetwork"; + } + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + "eutranet3gpp:EUtraNetwork" { - //if-feature eutranet3gpp:ExternalENBFunctionUnderEUtraNetwork; + if-feature ExternalENBFunctionUnderEUtraNetwork; uses ExternalENBFunctionWrapper; } } \ No newline at end of file -- GitLab From 11f29717697a868f6826353af2ab1ae3821e3c8d Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 19 May 2025 17:14:03 +0900 Subject: [PATCH 52/94] added MWAB --- yang-models/_3gpp-common-managed-element.yang | 10 +++ yang-models/_3gpp-common-subnetwork.yang | 11 +++ yang-models/_3gpp-nr-nrm-mwab.yang | 76 +++++++++++++++++++ 3 files changed, 97 insertions(+) create mode 100644 yang-models/_3gpp-nr-nrm-mwab.yang diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index 40fb72275..3148c9a9b 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -15,6 +15,7 @@ module _3gpp-common-managed-element { import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; } import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; } import _3gpp-5gc-nrm-stmfunction { prefix stm3gpp; } + import _3gpp-nr-nrm-mwab { prefix mwab3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -36,6 +37,7 @@ module _3gpp-common-managed-element { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2025-04-25 { reference CR-1527 ; } revision 2025-03-25 { reference "CR-0516"; } revision 2024-10-01 { reference "CR-0437,CR-0438" ; } revision 2024-01-30 { reference CR-0328 ; } @@ -133,6 +135,10 @@ module _3gpp-common-managed-element { description "The StmCtrlSubtree shall be contained under ManagedElement"; } + feature MWABUnderManagedElement { + description "The MWAB shall be contained under ManagedElement"; + } + grouping ManagedElement_Grp { description "Abstract class representing telecommunications resources. An ME communicates with a manager (directly or indirectly) for the @@ -326,5 +332,9 @@ module _3gpp-common-managed-element { uses stm3gpp:StmCtrlSubTree { if-feature StmCtrlUnderManagedElement ; } + + uses mwab3gpp:MWABSubTree { + if-feature MWABUnderManagedElement ; + } } } diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang index 82a407e4e..254cc08bc 100755 --- a/yang-models/_3gpp-common-subnetwork.yang +++ b/yang-models/_3gpp-common-subnetwork.yang @@ -16,6 +16,7 @@ module _3gpp-common-subnetwork { import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; } import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; } import _3gpp-5gc-nrm-stmfunction { prefix stm3gpp; } + import _3gpp-nr-nrm-mwab { prefix mwab3gpp; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -36,6 +37,7 @@ module _3gpp-common-subnetwork { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2025-04-25 { reference CR-1527 ; } revision 2025-03-25 { reference "CR-0516 CR-0527"; } revision 2024-11-19 { reference "Add STM"; } revision 2024-01-30 { reference CR-1337 ; } @@ -150,6 +152,10 @@ module _3gpp-common-subnetwork { description "The StmCtrlSubtree shall be contained under SubNetwork"; } + feature MWABUnderSubNetwork { + description "The MWAB shall be contained under SubNetwork"; + } + grouping Domain_Grp { description "A domain is a partition of instances of managed entities such that : @@ -266,6 +272,11 @@ module _3gpp-common-subnetwork { if-feature StmCtrlUnderManagedSubNetwork ; } + + uses mwab3gpp:MWABSubTree { + if-feature MWABUnderSubNetwork ; + } + yangmnt:mount-point children-of-SubNetwork { description "Mountpoint for contained ManagedElements and SubNetworks"; reference "RFC8528 YANG Schema Mount"; diff --git a/yang-models/_3gpp-nr-nrm-mwab.yang b/yang-models/_3gpp-nr-nrm-mwab.yang new file mode 100644 index 000000000..e57a85bf1 --- /dev/null +++ b/yang-models/_3gpp-nr-nrm-mwab.yang @@ -0,0 +1,76 @@ +module _3gpp-nr-nrm-mwab { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-nr-nrm-mwab"; + prefix "mwab3gpp"; + + import ietf-yang-types { prefix yang; } + import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-top { prefix top3gpp; } + + organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "Defines the YANG mapping of the ExternalGNBCUCPFunction + Information Object Class (IOC), that is part of the NR Network Resource + Model (NRM). + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + + revision 2025-04-25 { reference CR-1527 ; } + + grouping MWABGrp { + description "Represets the ExternalENBFunction IOC."; + + leaf operationalState { + description "It indicates the operational state of the MWAB instance. + It describes whether the resource is installed and partially or fully + operable (Enabled) or the resource is not installed or not + operable (Disabled)."; + mandatory true; + config false; + type types3gpp:OperationalState; + } + + leaf administrativeState { + description "It indicates the administrative state of the MWAB instance. + It describes the permission to use or prohibition against using the + MWAB functionalities, imposed through the OAM services."; + default LOCKED; + type types3gpp:AdministrativeState; + } + + list allowedArea { + description "This specifies the area where the MWAB can act as MWAB-gNB. + If the OAM indicates that the MWAB can act as MWAB-gNB is allowed areas, + it acts as MWAB-gNB only on the allowed area only. + (See sub clause 5.49 TS 28.662)."; + key idx; + leaf idx { type uint32; } + uses types3gpp:GeoAreaGrp; + } + + leaf-list allowedTime { + description "This species the time window for which the MWAB can act as + MWAB-gNB. If the allowed time window/validity indicates 20th June, + 10 am to 5 pm of the day, the MWAB acts as an MWAB g-NB only during + 20th June, 10 am to 5 pm of the day, and does not act as MWAB-gNB for + any other time. (See sub clause 5.49 TS 28.662)."; + type yang:date-and-time; + } + } + + grouping MWABSubTree { + list MWAB { + description "MWAB provides an NR access link to UEs in proximity and + connects to the 5GC serving the UE through an IP connectivity provided + by a Backhaul PDU session(s). The MWAB consists of a gNB component + (MWAB-gNB) and a UE component (MWAB-UE). This IOC defines the + configuration information for the MWAB-gNB."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses MWABGrp; + } + } + } +} -- GitLab From 0bee3b9abb6f65b02bf30d789b3f156e6843d7cc Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 21 May 2025 01:41:58 +0900 Subject: [PATCH 53/94] Corrected containment, updated revision to indicate common r18/19 modules --- yang-models/_3gpp-nr-nrm-eutranetwork.yang | 2 +- yang-models/_3gpp-nr-nrm-eutranfrequency.yang | 23 +++++++++++++++---- .../_3gpp-nr-nrm-externalamffunction.yang | 7 ++---- .../_3gpp-nr-nrm-externalenbfunction.yang | 2 +- .../_3gpp-nr-nrm-externaleutrancell.yang | 2 +- .../_3gpp-nr-nrm-externalgnbcucpfunction.yang | 2 +- .../_3gpp-nr-nrm-externalgnbcuupfunction.yang | 2 +- .../_3gpp-nr-nrm-externalgnbdufunction.yang | 2 +- .../_3gpp-nr-nrm-externalnrcellcu.yang | 2 +- ...3gpp-nr-nrm-externalservinggwfunction.yang | 7 +++--- .../_3gpp-nr-nrm-externalupffunction.yang | 4 ++-- yang-models/_3gpp-nr-nrm-nrfrequency.yang | 15 ++++++++++++ yang-models/_3gpp-nr-nrm-nrnetwork.yang | 2 +- 13 files changed, 50 insertions(+), 22 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-eutranetwork.yang b/yang-models/_3gpp-nr-nrm-eutranetwork.yang index 7a1e01278..ab7dc74f8 100755 --- a/yang-models/_3gpp-nr-nrm-eutranetwork.yang +++ b/yang-models/_3gpp-nr-nrm-eutranetwork.yang @@ -15,7 +15,7 @@ module _3gpp-nr-nrm-eutranetwork { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2025-04-25 { reference CR-1527 ; } + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-06-17 {reference "Initial revision"; } diff --git a/yang-models/_3gpp-nr-nrm-eutranfrequency.yang b/yang-models/_3gpp-nr-nrm-eutranfrequency.yang index 57a75adbc..70508b134 100755 --- a/yang-models/_3gpp-nr-nrm-eutranfrequency.yang +++ b/yang-models/_3gpp-nr-nrm-eutranfrequency.yang @@ -6,6 +6,7 @@ module _3gpp-nr-nrm-eutranfrequency { import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; } + import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; @@ -17,7 +18,7 @@ module _3gpp-nr-nrm-eutranfrequency { reference "3GPP TS 28.541 5G Network Resource Model (NRM), 3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)"; - revision 2025-04-25 { reference CR-1527 ; } + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { reference "Initial revision"; } @@ -53,8 +54,22 @@ module _3gpp-nr-nrm-eutranfrequency { } } - augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" - + "eutranet3gpp:EUtraNetwork" { - uses EUtranFrequencyWrapper ; + feature EUtranFrequencyUnderSubNetwork { + description "The EUtranFrequency shall be contained under SubNetwork"; + } + + augment "/subnet3gpp:SubNetwork" { + if-feature EUtranFrequencyUnderSubNetwork ; + uses EUtranFrequencyWrapper; + } + + feature EUtranFrequencyUnderEUtraNetwork { + description "The EUtranFrequency shall be contained under EUtraNetwork"; + } + + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + + "eutranet3gpp:EUtraNetwork" { + if-feature EUtranFrequencyUnderEUtraNetwork; + uses EUtranFrequencyWrapper; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-externalamffunction.yang b/yang-models/_3gpp-nr-nrm-externalamffunction.yang index 14284129f..f74c5d3a0 100755 --- a/yang-models/_3gpp-nr-nrm-externalamffunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalamffunction.yang @@ -16,16 +16,13 @@ module _3gpp-nr-nrm-externalamffunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2025-04-25 { reference CR-1527 ; } + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } - revision 2019-06-17 { - description "Initial revision"; - } + revision 2019-06-17 { reference "Initial revision"; } grouping ExternalAMFFunctionGrp { description "Represents the ExternalAMFFunction IOC."; - reference "3GPP TS 28.541"; uses mf3gpp:ManagedFunctionGrp; list pLMNIdList { diff --git a/yang-models/_3gpp-nr-nrm-externalenbfunction.yang b/yang-models/_3gpp-nr-nrm-externalenbfunction.yang index 971a8a1f8..ed8cb6683 100755 --- a/yang-models/_3gpp-nr-nrm-externalenbfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalenbfunction.yang @@ -21,7 +21,7 @@ module _3gpp-nr-nrm-externalenbfunction { reference "3GPP TS 28.541 5G Network Resource Model (NRM), 3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)"; - revision 2025-04-25 { reference CR-1527 ; } + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { reference "Initial revision"; } diff --git a/yang-models/_3gpp-nr-nrm-externaleutrancell.yang b/yang-models/_3gpp-nr-nrm-externaleutrancell.yang index 2e09e4e44..2a5ff1f39 100755 --- a/yang-models/_3gpp-nr-nrm-externaleutrancell.yang +++ b/yang-models/_3gpp-nr-nrm-externaleutrancell.yang @@ -17,7 +17,7 @@ module _3gpp-nr-nrm-externaleutrancell { reference "3GPP TS 28.541 5G Network Resource Model (NRM), 3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)"; - revision 2025-04-25 { reference CR-1527 ; } + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { reference "Initial revision"; } diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang index 83941105a..ff466a30b 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang @@ -21,7 +21,7 @@ module _3gpp-nr-nrm-externalgnbcucpfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2025-04-25 { reference CR-1527 ; } + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { reference "Initial revision"; } diff --git a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang index ac641a305..41ac84351 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang @@ -19,7 +19,7 @@ module _3gpp-nr-nrm-externalgnbcuupfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2025-04-25 { reference CR-1527 ; } + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { reference "Initial revision"; } diff --git a/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang b/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang index ac3c474fc..115fdf6c8 100755 --- a/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang @@ -20,7 +20,7 @@ module _3gpp-nr-nrm-externalgnbdufunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2025-04-25 { reference CR-1527 ; } + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { reference "Initial revision"; } diff --git a/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang b/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang index ab1a142c2..1586cad43 100755 --- a/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang +++ b/yang-models/_3gpp-nr-nrm-externalnrcellcu.yang @@ -15,7 +15,7 @@ module _3gpp-nr-nrm-externalnrcellcu { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2025-04-25 { reference CR-1527 ; } + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { reference "Initial revision"; } diff --git a/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang b/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang index 3b2052cdd..dcaba95b4 100755 --- a/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalservinggwfunction.yang @@ -4,7 +4,7 @@ module _3gpp-nr-nrm-externalservinggwfunction { prefix "extservgw3gpp"; import _3gpp-common-managed-function { prefix mf3gpp; } - import _3gpp-common-subnetwork { prefix subnet3gpp; } + //import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; @@ -15,6 +15,7 @@ module _3gpp-nr-nrm-externalservinggwfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { @@ -42,12 +43,12 @@ module _3gpp-nr-nrm-externalservinggwfunction { } } - augment "/subnet3gpp:SubNetwork" { + /*augment "/subnet3gpp:SubNetwork" { if-feature subnet3gpp:ExternalsUnderSubNetwork ; uses ExternalServingGWFunctionWrapper; } - /*augment "/eutranet3gpp:EUtraNetwork" { + augment "/eutranet3gpp:EUtraNetwork" { if-feature eutranet3gpp:ExternalsUnderEUtraNetwork; uses ExternalServingGWFunctionWrapper; }*/ diff --git a/yang-models/_3gpp-nr-nrm-externalupffunction.yang b/yang-models/_3gpp-nr-nrm-externalupffunction.yang index 044358beb..abe82b6c8 100755 --- a/yang-models/_3gpp-nr-nrm-externalupffunction.yang +++ b/yang-models/_3gpp-nr-nrm-externalupffunction.yang @@ -12,11 +12,11 @@ module _3gpp-nr-nrm-externalupffunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the ExternalUPFFunction 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 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2025-04-25 { reference CR-1527 ; } + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19 revision 2023-09-18 { reference CR-1043 ; } revision 2019-10-28 { reference S5-193518 ; } revision 2019-06-17 { diff --git a/yang-models/_3gpp-nr-nrm-nrfrequency.yang b/yang-models/_3gpp-nr-nrm-nrfrequency.yang index 515e8300c..734a4da74 100755 --- a/yang-models/_3gpp-nr-nrm-nrfrequency.yang +++ b/yang-models/_3gpp-nr-nrm-nrfrequency.yang @@ -6,6 +6,7 @@ module _3gpp-nr-nrm-nrfrequency { import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; } import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; } + import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-top { prefix top3gpp; } organization "3GPP SA5"; @@ -61,8 +62,22 @@ module _3gpp-nr-nrm-nrfrequency { } } + feature NRFrequencyUnderNRNetwork { + description "NRFrequency shall be contained under NRNetwork"; + } + augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" + "nrnet3gpp:NRNetwork" { + if-feature NRFrequencyUnderNRNetwork; + uses NRFrequencyWrapper; + } + + feature NRFrequencyUnderSubNetwork { + description "NRFrequency shall be contained under SubNetwork"; + } + + augment "/subnet3gpp:SubNetwork" { + if-feature NRFrequencyUnderSubNetwork; uses NRFrequencyWrapper; } } \ No newline at end of file diff --git a/yang-models/_3gpp-nr-nrm-nrnetwork.yang b/yang-models/_3gpp-nr-nrm-nrnetwork.yang index c1cf0952a..044c2d0db 100755 --- a/yang-models/_3gpp-nr-nrm-nrnetwork.yang +++ b/yang-models/_3gpp-nr-nrm-nrnetwork.yang @@ -15,7 +15,7 @@ module _3gpp-nr-nrm-nrnetwork { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2025-04-25 { reference CR-1527 ; } + revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common r17, r18 revision 2023-09-18 { reference CR-1043 ; } revision 2019-06-17 { reference "Initial revision"; } -- GitLab From e9de0efa21bf7fb57e98d702bd2a714f922a2588 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 21 May 2025 13:02:09 +0900 Subject: [PATCH 54/94] Removed incorrect note from measurements --- yang-models/_3gpp-common-measurements.yang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index 02df31bf7..27541b18e 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -43,7 +43,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 + ManagedFunction. Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 @@ -56,6 +56,7 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; + revision 2025-05-19 { reference CR-0532; } revision 2025-02-07 { reference CR-0461; } revision 2025-01-29 { reference CR-0512; } revision 2024-11-01 { reference CR-0488; } -- GitLab From 8498125f8eb214bef8833caa62c02e16d3b54a0e Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Fri, 23 May 2025 10:30:37 +0900 Subject: [PATCH 55/94] removing dLTMControl parameter not present in stage 2 --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 037c7c625..e2fb8feb3 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -20,6 +20,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-05-25 { reference "CR-1527" ; } revision 2025-03-25 { reference "CR-1509"; } revision 2025-01-25 { reference "CR-1442"; } revision 2024-11-07 { reference "CR-1443"; } @@ -253,13 +254,6 @@ module _3gpp-nr-nrm-gnbcucpfunction { enabled or disabled."; } - leaf dLTMControl { - type boolean; - default false; - description "This attribute determines whether the distributed SON - function LTM Cell Switch is enabled or disabled."; - } - list qceIdMappingInfoList { description "List of the mapping relationship between QoE collection entity identity, PLMN where QoE collection entity resides, and the IP address of @@ -296,7 +290,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { leaf idx { type uint32; } uses types5g3gpp:MappedCellIdInfoGrp; } - + leaf configurable5QISetRef { type types3gpp:DistinguishedName; description "DN of the Configurable5QISet that the GNBCUCPFunction -- GitLab From 4a46e293bd8c2c35fd514b2af307ed7f694c7001 Mon Sep 17 00:00:00 2001 From: ligan Date: Tue, 27 May 2025 04:09:28 +0000 Subject: [PATCH 56/94] 28.310 CR0082 rel19 meeting161 add nrm energy related information yang --- .../_3gpp-engy-nrm-energyinformation.yang | 196 ++++++++++++++++++ 1 file changed, 196 insertions(+) create mode 100644 yang-models/_3gpp-engy-nrm-energyinformation.yang diff --git a/yang-models/_3gpp-engy-nrm-energyinformation.yang b/yang-models/_3gpp-engy-nrm-energyinformation.yang new file mode 100644 index 000000000..38b72c25e --- /dev/null +++ b/yang-models/_3gpp-engy-nrm-energyinformation.yang @@ -0,0 +1,196 @@ +module _3gpp-engy-nrm-energyinformation { + yang-version 1.1; + + namespace urn:3gpp:sa5:_3gpp-engy-nrm-energyinformation; + prefix engyinfo3gpp; + + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-common-yang-types { prefix types3gpp; } + 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 Energy Information NRM. + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, + TSDSI, TTA, TTC). All rights reserved."; + reference "3GPP TS 28.310"; + + revision 2025-05-07 { reference CR-0082 ; } + + + feature energyinformationUnderSubNetwork { + description "The energyinformation shall be contained under SubNetwork"; + } + + feature energyinformationUnderManagedElement { + description "The energyrelatedinformation shall be contained under + ManagedElement"; + } + + grouping EnergySourceInfoGrp { + description "This data type defines the information related to a type + of energy source. This information is configured by the operator with + the information obtained from sources external to 3GPP. The attribute + energySourceType is used to indicate the type of energy source used by + an energy supply mode to produce the energy. The attribute energySourceCef + is used to indicate the carbon emission factor of the energy source. + The attribute renewableEnergy is used to indicate if the energy source + is renewable or non-renewable. The attribute energyCompositionPercentage + is used to indicate the percentage of energy source used to produce the + energy."; + + leaf energySourceType { + type string; + mandatory true; + description "The attribute is used to indicate the type of energy source + used by an energy supply mode to produce the energy."; + } + + leaf energySourceCef { + type decimal64 { + fraction-digits 2; + } + mandatory true; + units "kg CO2eq/kWh"; + description "The attribute is used to indicate the Carbon Emission Factor + of a type of energy source. Its unit is kg CO2eq / kWh."; + } + + leaf renewableEnergy { + description "This attribute represents if the energy source is renewable + or non-renewable. This information is configured by the operator with the + information obtained from external sources."; + type boolean; + mandatory true; + } + + leaf energyCompositionPercentage { + type uint8 { + range 0..100; + } + default 100; + description "The attribute is used to indicate the percentage of energy + source type used by the energy supply mode."; + } + + } + + grouping EnergyInfoGroupGrp { + + leaf energySupplyModeRefList { + description "The list of energy supply modes for the Network Elements + of the group. This information is configured by the operator with the + information obtained from external sources."; + type types3gpp:DistinguishedName; + } + + leaf memberDNList { + description "This attribute contains the DNs of managed entities + that are members of the energy info group."; + type types3gpp:DistinguishedName; + } + + } + + grouping EnergySupplyInfoGrp { + + leaf energySupplyMode { + description "The mode by which energy is supplied to a Network Element. + This information is configured by the operator with the information + obtained from external sources.The mode can be one of the following: + GRID_ELECTRICITY: Energy from local grid electricity + (See Grid electricity in clause 6 of ITU-T Recommendation L.1333 [D]) + BACKUP_ENERGY: Energy from backup diesel or other types (from battery + banks/UPS), or from generators such as solar panels. (See Backup energy + in clause 6 of ITU-T Recommendation L.1333[D]) LOCALLY_GENERATED_ENERGY: + Energy provided by local generators not used for backup functionality, + e.g., solar panels, wind generator etc. (See Locally generated energy + in clause 6 of ITU-T Recommendation L.1333[D])"; + mandatory true; + type enumeration { + enum GRID_ELECTRICITY; + enum BACKUP_ENERGY; + enum LOCALLY_GENERATED_ENERGY; + } + } + + list energySourceList { + description "This attribute represents the list of sources used to + produce the energy by the supplier. This includes energy related + information i.e., carbon emission and renewable energy related + information, and the percentage of the energy produced using the + source."; + min-elements 1; + key idx; + leaf idx { type uint32; } + uses EnergySourceInfoGrp; + } + } + + augment "/subnet3gpp:SubNetwork" { + if-feature energyinformationUnderSubNetwork; + list EnergyInfoGroup { + description "This IOC represents a group of Network Elements, represented + by ManagedElement IOC and information related to the energy supply modes + that are used to power them. This information is configured by the + operator. Attribute memberDNList can be configured with the DNs of + ManagedElement or DNs of SubNetwork. This attribute provides the list + of Network Elements in the group, represented using ManagedElement MOIs + or represented using SubNetwork MOIs. In the case, memberDNList is + configured by DN of SubNetwork, then all the ManagedElement MOIs that + are name-contained by the SubNetwork MOI are part of the group. Attribute + energySupplyModeRefList is used to indicate the mode of energy supply + for powering the Network Elements of the group."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses EnergyInfoGroupGrp; + } + } + list EnergySupplyInfo { + description "This IOC defines the information related to energy supply + and the sources used to produce the energy. This information is configured + by the operator with the information obtained from sources external to + 3GPP e.g an energy supplier. "; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses EnergyInfoGroupGrp; + } + } + } + + augment "/me3gpp:ManagedElement" { + if-feature energyinformationUnderManagedElement; + list EnergyInfoGroup { + description "This IOC represents a group of Network Elements, represented + by ManagedElement IOC and information related to the energy supply modes + that are used to power them. This information is configured by the + operator. Attribute memberDNList can be configured with the DNs of + ManagedElement or DNs of SubNetwork. This attribute provides the list + of Network Elements in the group, represented using ManagedElement MOIs + or represented using SubNetwork MOIs. In the case, memberDNList is + configured by DN of SubNetwork, then all the ManagedElement MOIs that + are name-contained by the SubNetwork MOI are part of the group. Attribute + energySupplyModeRefList is used to indicate the mode of energy supply + for powering the Network Elements of the group."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses EnergyInfoGroupGrp; + } + } + list EnergySupplyInfo { + description "This IOC defines the information related to energy supply + and the sources used to produce the energy. This information is configured + by the operator with the information obtained from sources external to + 3GPP e.g an energy supplier. "; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses EnergyInfoGroupGrp; + } + } + } +} \ No newline at end of file -- GitLab From 1241e65fdf3ebc532d8aa22802d755d8690b7ea5 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 9 May 2025 17:43:12 +0000 Subject: [PATCH 57/94] Add new file --- yang-models/_3gpp-common-antennafunction.yang | 210 ++++++++++++++++++ 1 file changed, 210 insertions(+) create mode 100644 yang-models/_3gpp-common-antennafunction.yang diff --git a/yang-models/_3gpp-common-antennafunction.yang b/yang-models/_3gpp-common-antennafunction.yang new file mode 100644 index 000000000..881bca02c --- /dev/null +++ b/yang-models/_3gpp-common-antennafunction.yang @@ -0,0 +1,210 @@ +module _3gpp-common-antennafunction { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-common-antennafunction"; + prefix "antfunc3gpp"; + + import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-common-top { prefix top3gpp; } + + organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "Defines the YANG mapping of the Antenna Function Information + Object Class (IOC) that is part of the Generic Network Resource Model (NRM). + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.662 Generic Network Resource Model (NRM)"; + + revision 2025-05-01 { description "Initial revision"; + } + grouping AntennaFunctionGrp { + description "Represents the AntennaFunction."; + uses mf3gpp:ManagedFunctionGrp; + + leaf beamTilt { + description "The beam tilt of the wanted antenna beam + in the vertical plane. A positive value on the + beamtilt indicates an antenna beam direction below the + vertical plane."; + units degree; + type types3gpp:TenthOfDegrees; + } + + leaf bearing { + description "The bearing in degrees that the antenna is pointing in. + AllowedValues: See \"Antenna bearing\" in 3GPP TS 25.463."; + reference "3GPP TS 25.463, UTRAN Iuant interface: + Remote Electrical Tilting (RET) + antennas Application Part (RETAP) signalling"; + type types3gpp:TenthOfDegrees; + } + + leaf elevation { + description "The elevation the antenna function should have, + based on World Geodetic System (1984 version) global + reference frame (WGS 84). Positive values correspond to + meters above sea level, negative values correspond to meters + below sea level. If empty, value is not defined."; + type types3gpp:Altitude; + } + + leaf height { + description "The height of an antenna above sea level. + Note: The value of this attribute has no operational + impact on the network, e.g. the NE behavior is not + affected by the value setting of this attribute. Note as well + that this attribute is not supported over the Iuant interface + according to 3GPP TS 37.466. + Decprecated: Use 'elevation' attribute"; + reference "3GPP TS 37.466, Iuant interface: Application part"; + status deprecated; + units meters; + type uint64; + } + + leaf horizBeamWidth { + description "The 3 dB power beamwidth of the antenna pattern + in the horizontal plane. + A value of 360 indicates an omnidirectional antenna. + Note: The value of this attribute has no operational impact + on the network, e.g. the NE behaviour is not affected by the + value setting of this attribute. + Note as well that this attribute is not supported over the + Iuant interface according to 3GPP TS37.466. + A single integral value corresponding to an angle in degrees + between 0 and 360."; + reference "3GPP TS 37.466, Iuant interface: Application part"; + type types3gpp:TenthOfDegrees; + } + + leaf latitude { + description "Latitude of transmitter antenna position. + Positive value means north, negative value means south. + + Specification: WGS 84 + Allowed Values: { -90.000000..90.000000 }"; + units degree; + type types3gpp:Latitude; + } + + leaf longititude { + description "Longitude of transmitter antenna position. + Positive value means east, negative value means west. + Specification: WGS 84 + Allowed Values: { -180.000000..180.000000 }"; + units degree; + type types3gpp:Longitude; + } + + leaf maxAzimuthValue { + description "The maximum amount of change of azimuth the RET + system can support. This is the change in degrees clockwise + from bearing. + Note: The value of this attribute has no operational impact + on the network, e.g. the NE behaviour is not affected by the + value setting of this attribute. + Note as well that this attribute is not supported over the + Iuant interface according to Ref. 3GPP TS 37.466. + A single decimal value corresponding to an angle in degrees + between 0 and 360 with a resolution of 0.1 degrees."; + reference "3GPP TS 37.466, Iuant interface: Application part"; + units degree; + type decimal64 { + range "0..360"; + fraction-digits 1; + } + } + leaf minAzimuthValue { + description "The minimum amount of change of azimuth the RET + system can support. This is the change in degrees clockwise + from bearing. + Note: The value of this attribute has no operational impact + on the network, e.g. the NE behaviour is not affected by the + value setting of this attribute. + Note as well that this attribute is not supported over the + Iuant interface according to Ref. 3GPP TS 37.466. + A single decimal value corresponding to an angle in degrees + between 0 and 360 with a resolution of 0.1 degrees."; + reference "3GPP TS 37.466, Iuant interface: Application part"; + units degree; + type decimal64 { + range "0..360"; + fraction-digits 1; + } + } + + leaf-list referencedBy { + description "This attribute contains the DNs of one or more objects + that refer to this object. + + In the case of AntennaFunction, these referring objects may + include DNs of SectorEquipmentFunction instances if associations + between them and the AntennaFunction exist. + + Note: referencedBy is a DN datatype and so can reference an MOI + under a different ME"; + config false; + type types3gpp:DistinguishedName; + } + + + leaf retGroupName { + description "The group name is a textual, alpha-numeric string to + define a logical grouping of antennas which may be in different cells. + + This attribute permits the definition of a logical grouping + of the antennas. This may be defined either at + installation time, or by management activity"; + type string; + } + + leaf retTiltValue { + description "The electrical tilt setting of the antenna, \"Tilt value\" in + 3GPP TS 37.466."; + reference "3GPP TS 37.466, Iuant interface: Application part"; + type types3gpp:TenthOfDegrees; + } + + leaf vertBeamWidth { + description "The 3 dB power beamwidth of the antenna pattern in + the vertical plane. + The value of this attribute has no operational impact on + the network, e.g. the NE behaviour is not affected by the + value setting of this attribute. + This attribute is not supported over the Iuant interface + according to Ref. 3GPP TS 37.466."; + reference "3GPP TS 37.466, Iuant interface: Application part"; + units degree; + type uint32 { + range "0..180"; + } + } + + leaf-list theCellList { + description "This attribute contains the DNs of EUtranGenericCell + or UtranGenericCell if associations between them exist. + This attribute contains the DNs of GSMCellPart if association + between them exist. "; + config false; + status deprecated; + type types3gpp:DistinguishedName; + } + + } + + augment "/me3gpp:ManagedElement" { + + list AntennaFunction { + key id; + uses top3gpp:Top_Grp; + description "This MO represents an array of radiating elements that + may be tilted to adjust the RF coverage of a cell(s)."; + + container attributes { + uses AntennaFunctionGrp; + } + uses mf3gpp:ManagedFunctionContainedClasses; + } + } +} -- GitLab From 457f3d16ed8ade45cfa15adbac99d5f5db9be333 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 9 May 2025 17:44:01 +0000 Subject: [PATCH 58/94] Add new file --- .../_3gpp-common-sectorequipmentfunction.yang | 101 ++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 yang-models/_3gpp-common-sectorequipmentfunction.yang diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang new file mode 100644 index 000000000..fc499169b --- /dev/null +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -0,0 +1,101 @@ +module _3gpp-common-sectorequipmentfunction { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-common-sectorequipmentfunction"; + prefix "scteqpfun3gpp"; + + import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-managed-function { prefix mf3gpp; } + import _3gpp-common-managed-element { prefix me3gpp; } + import _3gpp-common-top { prefix top3gpp; } + + organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + description "Defines the YANG mapping of the Antenna Function Information + Object Class (IOC) that is part of the Generic Network Resource Model (NRM). + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + TTA, TTC). All rights reserved."; + reference "3GPP TS 28.662 Generic Network Resource Model (NRM)"; + + revision 2025-05-01 { description "Initial revision"; } + + grouping SectorEquipmentFunctionGrp { + description "Represents the SectorEquipmentFunction."; + uses mf3gpp:ManagedFunctionGrp; + + leaf confOutputPower { + description "It defines the allowed total power to use for all + cells together in this sector. + It may be set by the operator and/or limited by HW limitation + or licensed power, e.g.: 20, 40, 60, 80,120 watts"; + type uint32; + } + + leaf fqBands { + description "The list of frequency bands supported by the hardware + associated with the SectorEquipmentFunction. The earfcnDl and + earfcnUl or earfcn of cells associated with the SectorEquipmentFunction + must be assigned with value within one of the specified frequencyBands values. + + AllowedValues: + A list of frequency bands expressed as strings. + Valid frequency band values may be found in 3GPP TS 25.104 (3G), + 36.104 (LTE) and 38.104 (NR)."; + config false; + type string; + } + + leaf-list theAntennaList { + description "This attribute contains the distinguished names of the + AntennaFunction."; + type types3gpp:DistinguishedName; + } + + leaf-list theCellList { + description "This attribute contains the DNs of EUtranGenericCell + or UtranGenericCell if associations between them exist. + This attribute contains the DNs of GSMCellPart if association + between them exist. "; + config false; + type types3gpp:DistinguishedName; + } + + leaf-list theTMAList { + description "This attribute contains the DNs of one or more TMAFunctions."; + config false; + type types3gpp:DistinguishedName; + } + + leaf-list referencedBy { + description "This attribute contains the DNs of one or more objects + that refer to this object. + + In the case of SectorEquipmentFunction , these referring objects + may include Cells, NRSectorCarriers if associations between them + and the SectorEquipmentFunction exist. + + Note: referencedBy is a DN datatype and so can reference an MOI + under a different ME"; + config false; + type types3gpp:DistinguishedName; + } + } + + augment "/me3gpp:ManagedElement" { + list SectorEquipmentFunction { + key id; + uses top3gpp:Top_Grp; + description "This IOC represents a set of cells within a geographical + area that has common functions relating to AntennaFunction, TMAFunction + and supporting equipment, such as power amplifier."; + + must 'id != ""' { + error-message "Empty id value is not allowed."; + } + + container attributes { + uses SectorEquipmentFunctionGrp; + } + uses mf3gpp:ManagedFunctionContainedClasses; + } +} +} \ No newline at end of file -- GitLab From 34f2e1abfb97d2e99fad2d15cabb9b66c4c5103e Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 9 May 2025 17:53:32 +0000 Subject: [PATCH 59/94] Edit _3gpp-common-sectorequipmentfunction.yang -- GitLab From 700a13d1f583e7247111b7cd70b8d581977acadb Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 19 May 2025 08:26:16 +0000 Subject: [PATCH 60/94] Edit _3gpp-common-sectorequipmentfunction.yang --- .../_3gpp-common-sectorequipmentfunction.yang | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang index fc499169b..2ae4c866a 100644 --- a/yang-models/_3gpp-common-sectorequipmentfunction.yang +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -44,27 +44,6 @@ module _3gpp-common-sectorequipmentfunction { type string; } - leaf-list theAntennaList { - description "This attribute contains the distinguished names of the - AntennaFunction."; - type types3gpp:DistinguishedName; - } - - leaf-list theCellList { - description "This attribute contains the DNs of EUtranGenericCell - or UtranGenericCell if associations between them exist. - This attribute contains the DNs of GSMCellPart if association - between them exist. "; - config false; - type types3gpp:DistinguishedName; - } - - leaf-list theTMAList { - description "This attribute contains the DNs of one or more TMAFunctions."; - config false; - type types3gpp:DistinguishedName; - } - leaf-list referencedBy { description "This attribute contains the DNs of one or more objects that refer to this object. -- GitLab From cc5988400f1f00e7650f35e185aca1db405d3e19 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 19 May 2025 08:54:47 +0000 Subject: [PATCH 61/94] Edit _3gpp-common-sectorequipmentfunction.yang -- GitLab From 3975842cd4fe0caf6674bafd5c817dc819ec3c65 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 May 2025 09:35:27 +0000 Subject: [PATCH 62/94] Edit _3gpp-common-sectorequipmentfunction.yang --- .../_3gpp-common-sectorequipmentfunction.yang | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang index 2ae4c866a..c22df5227 100644 --- a/yang-models/_3gpp-common-sectorequipmentfunction.yang +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -30,16 +30,23 @@ module _3gpp-common-sectorequipmentfunction { type uint32; } - leaf fqBands { - description "The list of frequency bands supported by the hardware - associated with the SectorEquipmentFunction. The earfcnDl and - earfcnUl or earfcn of cells associated with the SectorEquipmentFunction - must be assigned with value within one of the specified frequencyBands values. - - AllowedValues: - A list of frequency bands expressed as strings. - Valid frequency band values may be found in 3GPP TS 25.104 (3G), - 36.104 (LTE) and 38.104 (NR)."; + leaf-list fqBandList { + description "The list of frequency bands/ranges supported by the + hardware associated with the SectorEquipmentFunction. The + earfcnDl and earfcnUl or earfcn of cells associated with the + SectorEquipmentFunction must be assigned one of the specified + frequency range values within the supported range. + + Valid frequency bands/ranges may be found in 3GPP TS 25.104 (UTRA), + 36.104 (E-UTRA) and 38.104 (NR). + + AllowedValues: + Operating band id or supported frequency tuple +
    expressed as a string. + + Examples for NR: + Bands: {'n1', 'n12'} + Frequencies: {'1920–1980, 2110–2170, FDD', '699–716, 729–746, FDD'}"; config false; type string; } -- GitLab From 04e8d6b9893ed40f4bcaa4ad7bf3249f5994575c Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 21 May 2025 09:38:59 +0000 Subject: [PATCH 63/94] Edit _3gpp-common-sectorequipmentfunction.yang -- GitLab From da5ebffcd8959082872f2a8acaad89461717791d Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 May 2025 00:05:15 +0000 Subject: [PATCH 64/94] Edit _3gpp-common-sectorequipmentfunction.yang --- yang-models/_3gpp-common-sectorequipmentfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang index c22df5227..e2e691bcb 100644 --- a/yang-models/_3gpp-common-sectorequipmentfunction.yang +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -42,7 +42,7 @@ module _3gpp-common-sectorequipmentfunction { AllowedValues: Operating band id or supported frequency tuple -
      expressed as a string. + expressed as a string. Examples for NR: Bands: {'n1', 'n12'} -- GitLab From dcc83eb71205db23db73492a245dc290b16bba70 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 May 2025 00:09:09 +0000 Subject: [PATCH 65/94] Edit _3gpp-common-sectorequipmentfunction.yang -- GitLab From 3e1bda3736988c6b46662223d58f44a9d8835a73 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 May 2025 06:38:26 +0000 Subject: [PATCH 66/94] Edit _3gpp-common-antennafunction.yang --- yang-models/_3gpp-common-antennafunction.yang | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/yang-models/_3gpp-common-antennafunction.yang b/yang-models/_3gpp-common-antennafunction.yang index 881bca02c..09fc423fa 100644 --- a/yang-models/_3gpp-common-antennafunction.yang +++ b/yang-models/_3gpp-common-antennafunction.yang @@ -48,21 +48,7 @@ module _3gpp-common-antennafunction { below sea level. If empty, value is not defined."; type types3gpp:Altitude; } - - leaf height { - description "The height of an antenna above sea level. - Note: The value of this attribute has no operational - impact on the network, e.g. the NE behavior is not - affected by the value setting of this attribute. Note as well - that this attribute is not supported over the Iuant interface - according to 3GPP TS 37.466. - Decprecated: Use 'elevation' attribute"; - reference "3GPP TS 37.466, Iuant interface: Application part"; - status deprecated; - units meters; - type uint64; - } - + leaf horizBeamWidth { description "The 3 dB power beamwidth of the antenna pattern in the horizontal plane. -- GitLab From 10feb2344494c5616df3d95bd5a74252c76fec2b Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 May 2025 07:09:20 +0000 Subject: [PATCH 67/94] Edit _3gpp-common-antennafunction.yang -- GitLab From 52ede66b7f9c106bc5e02fcf9b632349c1cdfb4b Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 May 2025 12:46:41 +0000 Subject: [PATCH 68/94] Edit _3gpp-common-antennafunction.yang --- yang-models/_3gpp-common-antennafunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-antennafunction.yang b/yang-models/_3gpp-common-antennafunction.yang index 09fc423fa..330c5c748 100644 --- a/yang-models/_3gpp-common-antennafunction.yang +++ b/yang-models/_3gpp-common-antennafunction.yang @@ -184,7 +184,7 @@ module _3gpp-common-antennafunction { list AntennaFunction { key id; uses top3gpp:Top_Grp; - description "This MO represents an array of radiating elements that + description "This MOI represents an array of radiating elements that may be tilted to adjust the RF coverage of a cell(s)."; container attributes { -- GitLab From 54965b5d1750c8c1cea7774daf0bee26496853e7 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 May 2025 12:47:37 +0000 Subject: [PATCH 69/94] Edit _3gpp-common-sectorequipmentfunction.yang --- yang-models/_3gpp-common-sectorequipmentfunction.yang | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-sectorequipmentfunction.yang b/yang-models/_3gpp-common-sectorequipmentfunction.yang index e2e691bcb..985e77639 100644 --- a/yang-models/_3gpp-common-sectorequipmentfunction.yang +++ b/yang-models/_3gpp-common-sectorequipmentfunction.yang @@ -10,8 +10,9 @@ module _3gpp-common-sectorequipmentfunction { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "Defines the YANG mapping of the Antenna Function Information - Object Class (IOC) that is part of the Generic Network Resource Model (NRM). + description "Defines the YANG mapping of the Sector Equipment Function + Information Object Class (IOC) that is part of the Generic Network Resource + Model (NRM). Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.662 Generic Network Resource Model (NRM)"; -- GitLab From fc55a8c8cc93ef445c9c6454d853afe26f8fa9bb Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 May 2025 12:57:40 +0000 Subject: [PATCH 70/94] Edit _3gpp-common-antennafunction.yang -- GitLab From 116bada04912fcee311735d325ba8cfda58b67d6 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 22 May 2025 12:58:11 +0000 Subject: [PATCH 71/94] Edit _3gpp-common-sectorequipmentfunction.yang -- GitLab From 74cc0323620cced3db3f5d1fee0fdfd58c896fdd Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 19 May 2025 11:07:57 +0900 Subject: [PATCH 72/94] Changed type of availabilityStatus --- .../_3gpp-common-subscription-control.yang | 85 ++++++++++++++++++- 1 file changed, 82 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang index 1bc0b418d..fcc5451e6 100755 --- a/yang-models/_3gpp-common-subscription-control.yang +++ b/yang-models/_3gpp-common-subscription-control.yang @@ -5,6 +5,7 @@ module _3gpp-common-subscription-control { import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } + import _3gpp-common-yang-types { prefix types3gpp; } import ietf-yang-types { prefix yang; } organization "3GPP SA5"; @@ -19,6 +20,7 @@ module _3gpp-common-subscription-control { Solution Set (SS) definitions 3GPP TS 28.623"; + revision 2025-05-13 { reference "CR-0548" ; } revision 2025-03-24 { reference "CR-0516 0518" ; } revision 2024-05-18 { reference CR-0359 ; } revision 2024-01-18 { reference "CR-0309 CR-0329" ; } @@ -132,6 +134,8 @@ module _3gpp-common-subscription-control { enum notifyFileReady; enum notifyFilePreparationError; enum notifyThresholdCrossing ; + enum notifyPotentialFaultyDataNodeTree; + enum notifyDataNodeTreeSyncRecommended; } type string; } @@ -175,6 +179,32 @@ module _3gpp-common-subscription-control { JSON expressions (Jex) 'JexConditionsExpr'"; reference "3GPP TS 32.161"; } + + leaf lastSequenceNo { + type uint64; + config false; + mandatory true; + description "The sequence number of the last notification that was sent + by a 'NtfSubscriptionControl' instance."; + } + + leaf operationalState { + type types3gpp:OperationalState; + config false; + mandatory true; + description "Operational state of manged object instance. + The operational state describes if an object instance is operable + ('ENABLED') or inoperable ('DISABLED'). + This state is set by the object instance or the MnS producer and + is hence READ-ONLY."; + } + + leaf-list availabilityStatus { + type types3gpp:AvailabilityStatus; + config false; + description "The availability status provides additional information + about the operational state"; + } } grouping HeartbeatControlGrp { @@ -253,19 +283,68 @@ module _3gpp-common-subscription-control { When a MnS consumer does not wish to receive notifications any more the MnS consumer shall delete the corresponding NtfSubscriptionControl instance. - + When a subscription is created and the notification scope inludes the created subscription object and the subscribed notification types include notifications reporting object creation (notifyMOICreation or notifyMOIChanges), the first notification sent related to the new subscription shall report the creation of the NtfSubscriptionControl instance. Likewise, when a subscription is - deleted and the notification scope inludes the deleted subscription + deleted and the notification scope includes the deleted subscription object and the subscribed notification types include notifications reporting object deletion (notifyMOIDeletion or notifyMOIChanges), the last notification sent related to the subscription shall report the deletion of the NtfSubscriptionControl instance. - + + If multiple NtfSubscriptionControl instances are configured to send + the same notification to the same notificationRecipientAddress, then + a separate notification message shall be sent for each such + NtfSubscriptionControl instance. + + A 'NtfSubscriptionControl' class optionally supports adding a sequence + number parameter to the notification header. For each notification + sent from a 'NtfSubscriptionControl' instance to the configured + notification recipient, the sequence number is increased by one. + This allows the notification recipient to detect notifications lost or + reordered in transit. The sequence number sent last is reflected in + the 'lastSequenceNo' attribute. This allows the MnS consumer to check + if he missed notifications in situations where he did not receive + any notification for some time. + + The 'operationalState' attribute represents the operability of the + subscription. The 'availabilityStatus' further qualifies the + opertational state. Both attributes are set by the MnS producer. + + If the 'operationalState' is set to 'ENABLED' and 'availabilityStatus' + has no value the subscription process is fully operational and + notifications are forwarded to the subscribed consumer. + + If the 'operationalState' is set to 'ENABLED' and 'availabilityStatus' + is set to 'DEGRADED' the subscription process is degraded. There is + no guarantee that all notifications, that should be forwarded to the + notification recipient, are forwarded. + + If the 'operationalState' is set to 'DISABLED' and 'availabilityStatus' + is set to 'FAILED' the subscription process is not operational, and + no notifications are sent to the notification recipient. + + If the 'operationalState' is set to 'DISABLED' and 'availabilityStatus' + is set to 'DEPENDENCY' the subscription process itself has no problems + but some other process on which it depends such as downstream + processes in the event channel that feeds events into the subscription + process. As a result, events are not delivered to the subscription + process and no notifications are sent to the notification recipient. + + When the subscription process is disabled or degraded and becomes + fully operational again, the MnS producer sends- the related data node + tree change notifications to subscribed MnS consumers. The MnS consumer + may use the reception of these notifications as a trigger to synchronize + his data node tree with the data node tree on the MnS producer. + However, the state change notifications contain no information about + which part of the data node tree should be synchronized. For this + purpose the 'notifyDataNodeTreeSyncRecommended' (TS 28.532 [27]) and + 'alarmListRebuilt' (TS 28.111 [58]) notifications are provided. + Creation and deletion of NtfSubscriptionControl instances by MnS consumers is optional; when not supported, the NtfSubscriptionControl instances may be created and deleted by the system or be -- GitLab From 1a2e028a25b70c2e1add9c8251ecf4eeb93803d1 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Sat, 3 May 2025 15:28:07 +0000 Subject: [PATCH 73/94] Edit _3gpp-common-fm.yang add new alarmType OTHER --- yang-models/_3gpp-common-fm.yang | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index 308f0dfd6..ec17cd8cc 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -41,6 +41,11 @@ module _3gpp-common-fm { } typedef eventType { + type enumeration { + enum OTHER { + value 1; + } + type enumeration { enum COMMUNICATIONS_ALARM { value 2; -- GitLab From 3763ca77cdbb8f415dc92c786a47858af3cb98ab Mon Sep 17 00:00:00 2001 From: lengyelb Date: Sat, 3 May 2025 15:34:14 +0000 Subject: [PATCH 74/94] Edit _3gpp-common-fm.yang add new alarmType OTHER + new revision statement --- yang-models/_3gpp-common-fm.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index ec17cd8cc..86b6cb903 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -16,6 +16,7 @@ module _3gpp-common-fm { TTA, TTC). All rights reserved."; reference "3GPP TS 28.111"; + revision 2025-05-01 { reference "CR-0042 CR-0043"; } revision 2025-03-25 { reference "CR-0025 CR-0026"; } revision 2024-05-12 { description "The definition of the module was from TS 28.623 to TS 28.111"; -- GitLab From 5ba65c0ee403f45eee862378a68f361f58820d45 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Sat, 3 May 2025 15:46:33 +0000 Subject: [PATCH 75/94] Edit _3gpp-common-fm.yang alarmType corrections --- yang-models/_3gpp-common-fm.yang | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang index 86b6cb903..b067ace3f 100755 --- a/yang-models/_3gpp-common-fm.yang +++ b/yang-models/_3gpp-common-fm.yang @@ -16,7 +16,7 @@ module _3gpp-common-fm { TTA, TTC). All rights reserved."; reference "3GPP TS 28.111"; - revision 2025-05-01 { reference "CR-0042 CR-0043"; } + revision 2025-05-01 { reference "CR-0042 CR-0043"; } // common for R18, R19 revision 2025-03-25 { reference "CR-0025 CR-0026"; } revision 2024-05-12 { description "The definition of the module was from TS 28.623 to TS 28.111"; @@ -47,7 +47,6 @@ module _3gpp-common-fm { value 1; } - type enumeration { enum COMMUNICATIONS_ALARM { value 2; } -- GitLab From cd69dcc48b0867399906466fbb19092a2956a722 Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Thu, 15 May 2025 15:42:18 +0000 Subject: [PATCH 76/94] Edit _3gpp-5gc-nrm-predefinedpccruleset.yang --- .../_3gpp-5gc-nrm-predefinedpccruleset.yang | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang b/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang index c065a3698..34db5ada0 100755 --- a/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang +++ b/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang @@ -610,7 +610,7 @@ module _3gpp-5gc-nrm-predefinedpccruleset { description "It contains transports TSCAI input parameters for TSC traffic at the ingress of the NW-TT (downlink flow direction)."; uses TscaiInputContainer; } - leaf easRedisInd { + leaf easRedisIndRequired { type boolean; default false; description "Indicates whether the EAS rediscovery is required for the application."; @@ -619,20 +619,24 @@ module _3gpp-5gc-nrm-predefinedpccruleset { type uint32; description "Indicates the (g)PTP domain that the (TSN)AF is located in."; } - leaf capBatAdaptation { + leaf capBatNotificationCapable { type boolean; default false; description "Indicates the capability for AF to adjust the burst sending time."; } - leaf disUeNotif { + leaf ueNotifEnabled { type boolean; default false; - description "Indicates whether QoS flow parameter signalling to the UE is disabled (TRUE), when the SMF is notified by the NG-RAN of changes in the fulfilled QoS situation,"; + description "Indicates whether QoS flow parameter signalling to the UE is enabled (TRUE), when the SMF is notified by the NG-RAN of changes in the fulfilled QoS situation,"; } leaf packFiltAllPrec { type uint32; description "Determines the order of TFT packet filter allocation for PCC rules."; - } + } + leaf nscSupportedFeats { + type uint32; + description "Indicates the Network Function Service Consumer features supported per service."; + } } grouping PredefinedPccRuleSetGrp { -- GitLab From a7a69b9a90fde7b6cea1e0c2c76a1c1a49c0b326 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Tue, 27 May 2025 15:18:04 +0200 Subject: [PATCH 77/94] Locally rebased and merged https://forge.3gpp.org/rep/sa5/MnS/-/merge_requests/1703 --- yang-models/_3gpp-common-trace.yang | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index fdf40d044..5c4694125 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -25,7 +25,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; - revision 2025-05-07 { reference "CR-0532" ; } + revision 2025-05-07 { reference "CR-0532 CR-0536" ; } revision 2025-02-07 { reference "CR-0504" ; } revision 2025-02-05 { reference "CR-0461" ; } revision 2024-11-25 { reference "CR-0492" ; } @@ -1479,16 +1479,6 @@ module _3gpp-common-trace { reference "clause 5.10.38 of TS 32.422"; } - list plmnList { - when '../../../jobType = "LOGGED_MDT_ONLY"'; - key "mcc mnc"; - uses types3gpp:PLMNId; - max-elements 16; - description "It indicates the PLMNs where measurement collection, status - indication and log reporting is allowed."; - reference "Clause 5.10.24 of 3GPP TS 32.422."; - } - list areaConfigurationForNeighCells { when '../../../jobType = "LOGGED_MDT_ONLY"'; key "idx"; @@ -1599,6 +1589,15 @@ module _3gpp-common-trace { both MN and SN. The value TRUE means the MDT configuration is for MN only."; } + + list plmnList { + key "mcc mnc"; + uses types3gpp:PLMNId; + max-elements 16; + description "It indicates the PLMNs where measurement collection, status + indication and log reporting is allowed."; + reference "Clause 5.10.24 of 3GPP TS 32.422."; + } } grouping UECoreMeasConfigGrp { -- GitLab From 68200f2b0ed06405edb1ab0cee96858abada0b11 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 28 May 2025 00:38:16 +0200 Subject: [PATCH 78/94] Locally rebased and merged https://forge.3gpp.org/rep/sa5/MnS/-/merge_requests/1711 --- yang-models/_3gpp-common-trace.yang | 134 +++++++++++++++------------- 1 file changed, 71 insertions(+), 63 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 5c4694125..bec576ffc 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -25,7 +25,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)" ; - revision 2025-05-07 { reference "CR-0532 CR-0536" ; } + revision 2025-05-07 { reference "CR-0532 CR-0536 CR-0540" ; } revision 2025-02-07 { reference "CR-0504" ; } revision 2025-02-05 { reference "CR-0461" ; } revision 2024-11-25 { reference "CR-0492" ; } @@ -1763,8 +1763,14 @@ module _3gpp-common-trace { } list traceTarget { - key "targetIdType targetIdValue"; + key "targetIdType"; max-elements 1; + description "It specifies the target object of the Trace, MDT and + 5GC UE level measurements collection. The attribute is applicable for + Trace, MDT, and 5GC UE level measurements collection. + In case of management based Immediate MDT, RLF reporting, RCEF + reporting or RRC reposring, the traceTarget attribute shall be null + value."; leaf targetIdType { type enumeration { @@ -1779,73 +1785,75 @@ module _3gpp-common-trace { enum RNC; enum GNB; enum SUPI; + enum N4_SESSION_ID; } + description "It specifies the target object of the Trace, MDT and + 5GC UE level measurements collection. The attribute is applicable for + Trace, MDT, and 5GC UE level measurements collection. + + The targetIdType shall be PUBLIC_ID in case of a Management Based + Activation is done to an SCSCFFunction (Serving Call Session Control + Function) or PCSCFFunction (Proxy Call Session Control Function) + + The targetIdType shall be UTRAN_CELL only in case of + UTRAN cell traffic trace function. + + The targetIdType shall be E-UTRAN_CELL only in case of E-UTRAN cell + traffic trace function. + + The targetIdType shall be NG-RAN_CELL only in case of NR cell + traffic trace function. + + The targetIdType shall be either IMSI, IMEI or + IMEISV if the Trace Session is activated to any of the following + ManagedEntity(ies): + - HssFunction + - MscServerFunction + - SgsnFunction + - GgsnFunction + - BmscFunction + - RncFunction + - MmeFunction + - ServingGWFunction + - PGWFunction + + The targetIdType shall be either SUPI or IMEISV if the Trace Session + is activated to any of the following ManagedEntity(ies): + - AFFunction + - AMFFunction + - AUSFunction + - NEFFunction + - NRFFunction + - NSSFFunction + - PCFFunction + - SMFFunction + - UPFFunction + - UDMFunction + + In case of signalling based MDT, the targetIdType shall be + able to carry PUBLIC_ID, IMSI, IMEI, IMEISV or SUPI. + + In case of management based Logged MDT, the targetIdType + shall carry an eNB or a gNB or an RNC. + The Logged MDT should be initiated on the specified eNB/gNB/RNC in + targetIdValueList. + + In case of signalling based 5GC UE level measurements collection, + the targetIdTypee shall be able to carry IMEISV or SUPI. + + In case of management based 5GC UE level measurements collection, + the targetIdType shall be able to carry the corresponding + Measured UE Identifier as defined by the bullet g) of the 5GC UE + level measurements (see TS 28.558) when the TraceJob is created at + the subject ManagedEntity."; } - leaf targetIdValue { + leaf-list targetIdValueList { type string; + description "It specifies the ID value(s) of the target object defined + by traceTargetType"; } - description "Specifies the target object of the Trace and MDT. The - attribute is applicable for both Trace and MDT. This attribute - includes the ID type of the target as an enumeration and the ID value. - - The traceTarget shall be 'PUBLIC_ID' in case of a Management Based - Activation is done to an SCSCFFunction (Serving Call - Session Control Function) - or PCSCFFunction (Proxy Call Session Control Function). - The traceTarget shall be 'UTRAN_CELL' only in case of the UTRAN - cell traffic trace function. - - The traceTarget shall be 'E-UTRAN_CELL' only in case of E-UTRAN cell - traffic trace function. - - The traceTarget shall be 'NG-RAN_CELL' only in case of NR cell - traffic trace function. - - The traceTarget shall be either 'IMSI', 'IMEI' or - 'IMEISV' if the Trace Session is activated to any of the following - ManagedEntity(ies): - - HssFunction - - MscServerFunction - - SgsnFunction - - GgsnFunction - - BmscFunction - - RncFunction - - MmeFunction - - ServingGWFunction - - PGWFunction - - The traceTarget shall be either 'SUPI' or 'IMEISV' if the Trace Session - is activated to any of the followed ManagedEntity(ies): - - AFFunction - - AMFFunction - - AUSFFunction - - NEFFunction - - NRFFunction - - NSSFFunction - - PCSCFFunction - - SMFFunction - - UPFFunction - - UDMFunction - - In case of signalling based MDT, the traceTarget attribute should - be able to carry 'PUBLIC_ID', 'IMSI', 'IMEI', 'IMEISV' or 'SUPI'. - - In case of management based Immediate MDT, the traceTarget attribute - shall be null value. In case of management based Logged MDT, the - traceTarget attribute shall carry an 'eNB' or a 'gNB' or an 'RNC'. - The Logged MDT should be initiated on the specified - eNB/gNB/RNC in traceTarget. - - In case of RLF reporting, or RCEF reporting, or RRC reporting, the - traceTarget attribute shall be null value. - - In case of signalling based GC UE level measurements collection, - the traceTarget attribute shall be able to carry the corresponding - Measured UE Identifier as defined by the bullet g) of the 5GC UE - level measurements (see TS 28.558) when the TraceJob is created - at the subject ManagedEntity."; reference "3GPP TS 32.422"; } -- GitLab From 83a8989892841690c17c9749425d1a49d13dd3af Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Mon, 21 Apr 2025 13:12:57 +0000 Subject: [PATCH 79/94] Update file _3gpp-5gc-nrm-stmfunction.yang --- yang-models/_3gpp-5gc-nrm-stmfunction.yang | 107 ++++++++++++++++++--- 1 file changed, 92 insertions(+), 15 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-5gc-nrm-stmfunction.yang index 5ad40a9c2..77d5ffa13 100644 --- a/yang-models/_3gpp-5gc-nrm-stmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-stmfunction.yang @@ -16,22 +16,16 @@ module _3gpp-5gc-nrm-stmfunction { reference "3GPP TS 28.abc Signalling traffic monitoring management"; + revision 2025-05-01 { reference "S5-25xxxx"; } revision 2024-11-07 { reference "S5-247077"; } - grouping StmCtrlGrp { - description "Represents the StmCtrl IOC."; + grouping NetworkInterfaceGrp { + description "Represents the STM Network Interface Datatype."; - leaf-list reportingNFList { - type types3gpp:DistinguishedName; - description "List of Network Function Distinguished Name, which - specifies the target network interface type to be monitored. If - this parameter is not present or it is empty, then all applicable - interface types from the target NF shall be monitored"; - } - - leaf-list networkInterfaceTypeList { + leaf networkInterfaceType { type enumeration { enum ALL; + enum N2; enum N4; enum N5; enum N7; @@ -42,21 +36,104 @@ module _3gpp-5gc-nrm-stmfunction { enum N13; enum N14; enum N15; + enum N16; + enum N17; + enum N18; + enum N20; + enum N21; enum N22; + enum N23; + enum N26; + enum N28; + enum N29; + enum N30; + enum N33; + enum N34; + enum N35; + enum N36; + enum N37; + enum N40; + enum N41; + enum N42; + enum N51; + enum N52; enum N58; enum N59; + enum N60; + enum N61; + enum N62; + enum N63; enum N80; enum N81; + enum N82; + enum N83; + enum N84; + enum N85; + enum N86; + enum N87; + enum N88; + enum N89; + enum N96; + enum NL1; + enum NL2; + enum NL5; + enum NL6; + enum NL8; + enum NL9; } default ALL; - description "List of network interface type. it specifies the network - function whose signalling traffic is to be monitored. If this + mandatory true; + description "List of network interface type to be monitored. The + applicable network interface type names are specified based on + subclause 4.2.3 of 3GPP TS 23.501 and clause 4.2.1 of 3GPP + TS 23.273. The value "ALL" is specified for the case if all the + applicable interface type of the network function shall be + monitored."; + reference "Clause 4.2.3 of 3GPP TS 23.501 and clause 4.2.1 of + 3GPP TS 23.273 for details on the allowed values."; + } + + leaf-list networkInterfaceInstanceList { + type types3gpp:DistinguishedName; + mandatory false; + description "The list of applicable network interface instances + of the network interface type specified by + networkInterfaceType."; + reference "allowedValues: DN of the following MOIs as specified + in subclause 5.2.1 of 3GPP TS 28.541" + } + + leaf-list serviceOperationList { + type string; + description "The list of applicable service operations exchanged + over the network interface instances specified by + networkInterfaceInstanceList. Or, + If networkInterfaceInstanceList is not present, the list of + applicable service operations exchanged over the network + interface type specified by networkInterfaceType."; + reference "allowedValues: refer to subclause 5.2 of 3GPP + TS 23.502 " + } + } + + grouping StmCtrlGrp { + description "Represents the StmCtrl IOC."; + + leaf-list reportingNFList { + type types3gpp:DistinguishedName; + description "List of Network Function Distinguished Name, which + specifies the target network interface type to be monitored. If + this parameter is not present or it is empty, then all applicable + interface types from the target NF shall be monitored"; + } + + leaf-list networkInterfaceList { + type NetworkInterfaceGrp; + description "List of network interface to be monitored. If this parameter is not present or it is empty, then all Network Functions within the SubNetwork or ManagedElement shall be monitored. This parameter shall be omitted if the STM control object is specified under a ManagedFunction. "; - reference "Clause 4.2.3 of 3GPP TS 23.501 for details on the - allowed values."; } leaf stmTargetUri { -- GitLab From 593d29b1f70f4028ef85ada2bbb8ca7024ed64f4 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Mon, 21 Apr 2025 13:20:03 +0000 Subject: [PATCH 80/94] Update file _3gpp-5gc-nrm-stmfunction.yang --- yang-models/_3gpp-5gc-nrm-stmfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-5gc-nrm-stmfunction.yang index 77d5ffa13..adf471d74 100644 --- a/yang-models/_3gpp-5gc-nrm-stmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-stmfunction.yang @@ -86,7 +86,7 @@ module _3gpp-5gc-nrm-stmfunction { description "List of network interface type to be monitored. The applicable network interface type names are specified based on subclause 4.2.3 of 3GPP TS 23.501 and clause 4.2.1 of 3GPP - TS 23.273. The value "ALL" is specified for the case if all the + TS 23.273. The value 'ALL' is specified for the case if all the applicable interface type of the network function shall be monitored."; reference "Clause 4.2.3 of 3GPP TS 23.501 and clause 4.2.1 of -- GitLab From 0b9ad10b45a0bafc38ced605fd82b8d0e5c61bc3 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Mon, 21 Apr 2025 13:23:41 +0000 Subject: [PATCH 81/94] Update file _3gpp-5gc-nrm-stmfunction.yang --- yang-models/_3gpp-5gc-nrm-stmfunction.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-5gc-nrm-stmfunction.yang index adf471d74..80a4ead30 100644 --- a/yang-models/_3gpp-5gc-nrm-stmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-stmfunction.yang @@ -100,7 +100,7 @@ module _3gpp-5gc-nrm-stmfunction { of the network interface type specified by networkInterfaceType."; reference "allowedValues: DN of the following MOIs as specified - in subclause 5.2.1 of 3GPP TS 28.541" + in subclause 5.2.1 of 3GPP TS 28.541"; } leaf-list serviceOperationList { @@ -112,7 +112,7 @@ module _3gpp-5gc-nrm-stmfunction { applicable service operations exchanged over the network interface type specified by networkInterfaceType."; reference "allowedValues: refer to subclause 5.2 of 3GPP - TS 23.502 " + TS 23.502"; } } -- GitLab From 01e4dac8292a23fb76d1838fa6b0bf837380888a Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Mon, 21 Apr 2025 13:27:11 +0000 Subject: [PATCH 82/94] Update file _3gpp-5gc-nrm-stmfunction.yang --- yang-models/_3gpp-5gc-nrm-stmfunction.yang | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-5gc-nrm-stmfunction.yang index 80a4ead30..456c5877d 100644 --- a/yang-models/_3gpp-5gc-nrm-stmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-stmfunction.yang @@ -82,7 +82,6 @@ module _3gpp-5gc-nrm-stmfunction { enum NL9; } default ALL; - mandatory true; description "List of network interface type to be monitored. The applicable network interface type names are specified based on subclause 4.2.3 of 3GPP TS 23.501 and clause 4.2.1 of 3GPP @@ -95,7 +94,6 @@ module _3gpp-5gc-nrm-stmfunction { leaf-list networkInterfaceInstanceList { type types3gpp:DistinguishedName; - mandatory false; description "The list of applicable network interface instances of the network interface type specified by networkInterfaceType."; @@ -128,7 +126,7 @@ module _3gpp-5gc-nrm-stmfunction { } leaf-list networkInterfaceList { - type NetworkInterfaceGrp; + uses NetworkInterfaceGrp; description "List of network interface to be monitored. If this parameter is not present or it is empty, then all Network Functions within the SubNetwork or ManagedElement shall be monitored. This -- GitLab From 6533b8a22e04d1b5d9a2f9acd917bfc4cdb9e81d Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Mon, 21 Apr 2025 13:30:23 +0000 Subject: [PATCH 83/94] Update file _3gpp-5gc-nrm-stmfunction.yang --- yang-models/_3gpp-5gc-nrm-stmfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-5gc-nrm-stmfunction.yang index 456c5877d..9d39c6c32 100644 --- a/yang-models/_3gpp-5gc-nrm-stmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-stmfunction.yang @@ -125,7 +125,7 @@ module _3gpp-5gc-nrm-stmfunction { interface types from the target NF shall be monitored"; } - leaf-list networkInterfaceList { + list networkInterfaceList { uses NetworkInterfaceGrp; description "List of network interface to be monitored. If this parameter is not present or it is empty, then all Network Functions -- GitLab From 3fb75008114d143de11040194b3e3f76beccb707 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Mon, 21 Apr 2025 13:35:26 +0000 Subject: [PATCH 84/94] Update file _3gpp-5gc-nrm-stmfunction.yang --- yang-models/_3gpp-5gc-nrm-stmfunction.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-5gc-nrm-stmfunction.yang index 9d39c6c32..ca0676a20 100644 --- a/yang-models/_3gpp-5gc-nrm-stmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-stmfunction.yang @@ -127,6 +127,7 @@ module _3gpp-5gc-nrm-stmfunction { list networkInterfaceList { uses NetworkInterfaceGrp; + key "networkInterfaceType"; description "List of network interface to be monitored. If this parameter is not present or it is empty, then all Network Functions within the SubNetwork or ManagedElement shall be monitored. This -- GitLab From fed0e3c0e9127c74751b97cea82417787018a1fe Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Thu, 24 Apr 2025 01:26:07 +0000 Subject: [PATCH 85/94] Update file _3gpp-5gc-nrm-stmfunction.yang --- yang-models/_3gpp-5gc-nrm-stmfunction.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-5gc-nrm-stmfunction.yang index ca0676a20..ee126f979 100644 --- a/yang-models/_3gpp-5gc-nrm-stmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-stmfunction.yang @@ -10,8 +10,8 @@ module _3gpp-5gc-nrm-stmfunction { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "This IOC represents the STM function defined in 3GPP TS 28.abc. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + description "This IOC represents the STM function defined in 3GPP TS 28.560. + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.abc Signalling traffic monitoring management"; -- GitLab From b062fdb41bb157a8556ca5714c607250609f30b2 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Sat, 26 Apr 2025 12:42:02 +0000 Subject: [PATCH 86/94] Update file _3gpp-5gc-nrm-stmfunction.yang --- yang-models/_3gpp-5gc-nrm-stmfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-5gc-nrm-stmfunction.yang index ee126f979..fb6383782 100644 --- a/yang-models/_3gpp-5gc-nrm-stmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-stmfunction.yang @@ -16,7 +16,7 @@ module _3gpp-5gc-nrm-stmfunction { reference "3GPP TS 28.abc Signalling traffic monitoring management"; - revision 2025-05-01 { reference "S5-25xxxx"; } + revision 2025-05-01 { reference "CR-0009"; } revision 2024-11-07 { reference "S5-247077"; } grouping NetworkInterfaceGrp { -- GitLab From dd54906c2c0dbe0ae5b4a9a1fc5c1821ffa1c1bb Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Sat, 26 Apr 2025 15:07:44 +0000 Subject: [PATCH 87/94] Update file _3gpp-5gc-nrm-stmfunction.yang --- yang-models/_3gpp-5gc-nrm-stmfunction.yang | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-5gc-nrm-stmfunction.yang index fb6383782..133533ac2 100644 --- a/yang-models/_3gpp-5gc-nrm-stmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-stmfunction.yang @@ -20,11 +20,22 @@ module _3gpp-5gc-nrm-stmfunction { revision 2024-11-07 { reference "S5-247077"; } grouping NetworkInterfaceGrp { - description "Represents the STM Network Interface Datatype."; + description "Represents the network interface for which signalling traffic + messages are to be copied and sent to the external entity. + The attribute networkInterfaceType specifies the network interface type to + be monitored. The optional attribute networkInterfaceInstanceList + specifies the network interface instances to be monitored. It is a list of + applicable network interface instances of the network interface type + specified by networkInterfaceType. The optional attribute + serviceOperationList specifies the service operations to be monitored. + It is a list of applicable service operations exchanged over the network + interface instances specified by networkInterfaceInstanceList, or, if + networkInterfaceInstanceList is not present, it is list of applicable + service operations exchanged over the network interface type specified + by networkInterfaceType."; leaf networkInterfaceType { type enumeration { - enum ALL; enum N2; enum N4; enum N5; -- GitLab From 4fc0087d7de4b04ba318482a85dcccdde56536be Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Sat, 26 Apr 2025 15:08:57 +0000 Subject: [PATCH 88/94] Update file _3gpp-5gc-nrm-stmfunction.yang --- yang-models/_3gpp-5gc-nrm-stmfunction.yang | 1 - 1 file changed, 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-5gc-nrm-stmfunction.yang index 133533ac2..a15fbe9f0 100644 --- a/yang-models/_3gpp-5gc-nrm-stmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-stmfunction.yang @@ -92,7 +92,6 @@ module _3gpp-5gc-nrm-stmfunction { enum NL8; enum NL9; } - default ALL; description "List of network interface type to be monitored. The applicable network interface type names are specified based on subclause 4.2.3 of 3GPP TS 23.501 and clause 4.2.1 of 3GPP -- GitLab From 6f64c6b574f70e23a058237f011c412dc7c6bc27 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Mon, 28 Apr 2025 12:44:43 +0000 Subject: [PATCH 89/94] Update file _3gpp-5gc-nrm-stmfunction.yang --- yang-models/_3gpp-5gc-nrm-stmfunction.yang | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-5gc-nrm-stmfunction.yang index a15fbe9f0..2ecb93805 100644 --- a/yang-models/_3gpp-5gc-nrm-stmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-stmfunction.yang @@ -16,7 +16,7 @@ module _3gpp-5gc-nrm-stmfunction { reference "3GPP TS 28.abc Signalling traffic monitoring management"; - revision 2025-05-01 { reference "CR-0009"; } + revision 2025-05-07 { reference "CR-0009"; } revision 2024-11-07 { reference "S5-247077"; } grouping NetworkInterfaceGrp { @@ -95,9 +95,7 @@ module _3gpp-5gc-nrm-stmfunction { description "List of network interface type to be monitored. The applicable network interface type names are specified based on subclause 4.2.3 of 3GPP TS 23.501 and clause 4.2.1 of 3GPP - TS 23.273. The value 'ALL' is specified for the case if all the - applicable interface type of the network function shall be - monitored."; + TS 23.273."; reference "Clause 4.2.3 of 3GPP TS 23.501 and clause 4.2.1 of 3GPP TS 23.273 for details on the allowed values."; } -- GitLab From 42d47874f2b564b19d6727ccfa0e6d2c6b3bc1b5 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Tue, 29 Apr 2025 13:29:59 +0000 Subject: [PATCH 90/94] Update file _3gpp-5gc-nrm-stmfunction.yang --- yang-models/_3gpp-5gc-nrm-stmfunction.yang | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-5gc-nrm-stmfunction.yang index 2ecb93805..8ddf5f59a 100644 --- a/yang-models/_3gpp-5gc-nrm-stmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-stmfunction.yang @@ -36,6 +36,7 @@ module _3gpp-5gc-nrm-stmfunction { leaf networkInterfaceType { type enumeration { + enum ALL; enum N2; enum N4; enum N5; @@ -92,10 +93,13 @@ module _3gpp-5gc-nrm-stmfunction { enum NL8; enum NL9; } + default ALL; description "List of network interface type to be monitored. The applicable network interface type names are specified based on subclause 4.2.3 of 3GPP TS 23.501 and clause 4.2.1 of 3GPP - TS 23.273."; + TS 23.273. + The value "ALL" is specified for the case if all the applicable + interface type of the network function shall be monitored."; reference "Clause 4.2.3 of 3GPP TS 23.501 and clause 4.2.1 of 3GPP TS 23.273 for details on the allowed values."; } -- GitLab From 6802d9f8ef38e99dfdca848ada5e367679c4d0db Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Tue, 29 Apr 2025 13:31:17 +0000 Subject: [PATCH 91/94] Update file _3gpp-5gc-nrm-stmfunction.yang --- yang-models/_3gpp-5gc-nrm-stmfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-5gc-nrm-stmfunction.yang index 8ddf5f59a..9d59d55cf 100644 --- a/yang-models/_3gpp-5gc-nrm-stmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-stmfunction.yang @@ -98,7 +98,7 @@ module _3gpp-5gc-nrm-stmfunction { applicable network interface type names are specified based on subclause 4.2.3 of 3GPP TS 23.501 and clause 4.2.1 of 3GPP TS 23.273. - The value "ALL" is specified for the case if all the applicable + The value ALL is specified for the case if all the applicable interface type of the network function shall be monitored."; reference "Clause 4.2.3 of 3GPP TS 23.501 and clause 4.2.1 of 3GPP TS 23.273 for details on the allowed values."; -- GitLab From 39a6f07eb1a791c13f5532c1fecd6380c07a043b Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Wed, 21 May 2025 23:41:24 -0500 Subject: [PATCH 92/94] Update file _3gpp-5gc-nrm-stmfunction.yang --- yang-models/_3gpp-5gc-nrm-stmfunction.yang | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-5gc-nrm-stmfunction.yang index 9d59d55cf..8dc23e5b5 100644 --- a/yang-models/_3gpp-5gc-nrm-stmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-stmfunction.yang @@ -20,12 +20,12 @@ module _3gpp-5gc-nrm-stmfunction { revision 2024-11-07 { reference "S5-247077"; } grouping NetworkInterfaceGrp { - description "Represents the network interface for which signalling traffic - messages are to be copied and sent to the external entity. - The attribute networkInterfaceType specifies the network interface type to - be monitored. The optional attribute networkInterfaceInstanceList - specifies the network interface instances to be monitored. It is a list of - applicable network interface instances of the network interface type + description "Represents the network interfaces for which signalling + traffic messages are to be copied and sent to the external entity. + The attribute networkInterfaceType specifies the network interface type + to be monitored. The optional attribute networkInterfaceInstanceList + specifies the network interface instances to be monitored. It is a list + of applicable network interface instances of the network interface type specified by networkInterfaceType. The optional attribute serviceOperationList specifies the service operations to be monitored. It is a list of applicable service operations exchanged over the network @@ -106,9 +106,9 @@ module _3gpp-5gc-nrm-stmfunction { leaf-list networkInterfaceInstanceList { type types3gpp:DistinguishedName; - description "The list of applicable network interface instances - of the network interface type specified by - networkInterfaceType."; + description "The list of applicable network interface instances, for + which the monitoring is to be performed, of the network interface + type specified by networkInterfaceType."; reference "allowedValues: DN of the following MOIs as specified in subclause 5.2.1 of 3GPP TS 28.541"; } @@ -117,7 +117,7 @@ module _3gpp-5gc-nrm-stmfunction { type string; description "The list of applicable service operations exchanged over the network interface instances specified by - networkInterfaceInstanceList. Or, + networkInterfaceInstanceList, that needs to be monitored. Or, If networkInterfaceInstanceList is not present, the list of applicable service operations exchanged over the network interface type specified by networkInterfaceType."; @@ -137,7 +137,7 @@ module _3gpp-5gc-nrm-stmfunction { interface types from the target NF shall be monitored"; } - list networkInterfaceList { + list targetInterfaceInfoList { uses NetworkInterfaceGrp; key "networkInterfaceType"; description "List of network interface to be monitored. If this -- GitLab From 5424827507bb3190a9e0eb9512b5ee6aa62a3fc4 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 28 May 2025 02:32:37 +0200 Subject: [PATCH 93/94] Locally rebased and merged https://forge.3gpp.org/rep/sa5/MnS/-/merge_requests/1704 --- yang-models/_3gpp-common-managed-element.yang | 4 ++-- yang-models/_3gpp-common-managed-function.yang | 5 +++-- yang-models/_3gpp-common-subnetwork.yang | 4 ++-- ...-nrm-stmfunction.yang => _3gpp-stm-nrm-stmfunction.yang} | 6 +++--- 4 files changed, 10 insertions(+), 9 deletions(-) rename yang-models/{_3gpp-5gc-nrm-stmfunction.yang => _3gpp-stm-nrm-stmfunction.yang} (97%) diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index 3148c9a9b..70e53be99 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -14,7 +14,7 @@ module _3gpp-common-managed-element { import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; } import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; } import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; } - import _3gpp-5gc-nrm-stmfunction { prefix stm3gpp; } + import _3gpp-stm-nrm-stmfunction { prefix stm3gpp; } import _3gpp-nr-nrm-mwab { prefix mwab3gpp; } organization "3GPP SA5"; @@ -37,7 +37,7 @@ module _3gpp-common-managed-element { 3GPP TS 28.620 Umbrella Information Model (UIM)"; - revision 2025-04-25 { reference CR-1527 ; } + revision 2025-04-25 { reference "CR-0532 CR0541" ; } revision 2025-03-25 { reference "CR-0516"; } revision 2024-10-01 { reference "CR-0437,CR-0438" ; } revision 2024-01-30 { reference CR-0328 ; } diff --git a/yang-models/_3gpp-common-managed-function.yang b/yang-models/_3gpp-common-managed-function.yang index 7b39b6798..2bffe8a90 100755 --- a/yang-models/_3gpp-common-managed-function.yang +++ b/yang-models/_3gpp-common-managed-function.yang @@ -8,13 +8,13 @@ module _3gpp-common-managed-function { import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-measurements { prefix meas3gpp; } import _3gpp-common-trace { prefix trace3gpp; } - import _3gpp-5gc-nrm-stmfunction { prefix stm3gpp; } + import _3gpp-stm-nrm-stmfunction { prefix stm3gpp; } organization "3GPP SA5"; 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 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.622 @@ -25,6 +25,7 @@ module _3gpp-common-managed-function { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2025-04-19 { reference "CR-0541"; } revision 2024-11-19 { reference "Add STM"; } revision 2024-02-24 { reference CR-0346; } revision 2023-09-18 { reference CR-0271; } diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang index 254cc08bc..c94f40638 100755 --- a/yang-models/_3gpp-common-subnetwork.yang +++ b/yang-models/_3gpp-common-subnetwork.yang @@ -15,7 +15,7 @@ module _3gpp-common-subnetwork { import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; } import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; } import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; } - import _3gpp-5gc-nrm-stmfunction { prefix stm3gpp; } + import _3gpp-stm-nrm-stmfunction { prefix stm3gpp; } import _3gpp-nr-nrm-mwab { prefix mwab3gpp; } organization "3GPP SA5"; @@ -37,7 +37,7 @@ module _3gpp-common-subnetwork { 3GPP TS 28.620 Umbrella Information Model (UIM)"; - revision 2025-04-25 { reference CR-1527 ; } + revision 2025-04-25 { reference "CR-0532 CR0541" ; } revision 2025-03-25 { reference "CR-0516 CR-0527"; } revision 2024-11-19 { reference "Add STM"; } revision 2024-01-30 { reference CR-1337 ; } diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-stm-nrm-stmfunction.yang similarity index 97% rename from yang-models/_3gpp-5gc-nrm-stmfunction.yang rename to yang-models/_3gpp-stm-nrm-stmfunction.yang index 8dc23e5b5..b26ef7fb2 100644 --- a/yang-models/_3gpp-5gc-nrm-stmfunction.yang +++ b/yang-models/_3gpp-stm-nrm-stmfunction.yang @@ -1,7 +1,7 @@ -module _3gpp-5gc-nrm-stmfunction { +module _3gpp-stm-nrm-stmfunction { yang-version 1.1; - namespace urn:3gpp:sa5:_3gpp-5gc-nrm-stmfunction; + namespace urn:3gpp:sa5:_3gpp-stm-nrm-stmfunction; prefix stm3gpp; import _3gpp-common-top { prefix top3gpp; } @@ -17,6 +17,7 @@ module _3gpp-5gc-nrm-stmfunction { Signalling traffic monitoring management"; revision 2025-05-07 { reference "CR-0009"; } + revision 2025-04-19 { reference "CR-0010"; } revision 2024-11-07 { reference "S5-247077"; } grouping NetworkInterfaceGrp { @@ -93,7 +94,6 @@ module _3gpp-5gc-nrm-stmfunction { enum NL8; enum NL9; } - default ALL; description "List of network interface type to be monitored. The applicable network interface type names are specified based on subclause 4.2.3 of 3GPP TS 23.501 and clause 4.2.1 of 3GPP -- GitLab From 0cfc467055fe852eff56fc94f05597a4e5cf178f Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 28 May 2025 03:07:03 +0200 Subject: [PATCH 94/94] Locally rebased and merged https://forge.3gpp.org/rep/sa5/MnS/-/merge_requests/1774 --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 16 ++++++++++++++++ yang-models/_3gpp-nr-nrm-gnbdufunction.yang | 5 ++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index e2fb8feb3..d776bf37a 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -21,6 +21,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; revision 2025-05-25 { reference "CR-1527" ; } + revision 2025-05-07 { reference "CR-1548"; } revision 2025-03-25 { reference "CR-1509"; } revision 2025-01-25 { reference "CR-1442"; } revision 2024-11-07 { reference "CR-1443"; } @@ -297,6 +298,21 @@ module _3gpp-nr-nrm-gnbcucpfunction { supports (is associated to)."; } + leaf isOnboardSatellite { + type boolean; + default false; + description "This attribute indicates whether the function is + on board the satellite."; + } + + leaf onboardSatelliteId { + type string; + config false; + description "This attribute indicates the onboard satellite Id. + It shall be formatted as a fixed 5-digit string, padding with + leading digits '0' to complete a 5-digit length."; + } + leaf dynamic5QISetRef { type types3gpp:DistinguishedName; description "DN of the Dynamic5QISet that the GNBCUCPFunction supports diff --git a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang index c042f5403..5f9de8da5 100755 --- a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang @@ -18,7 +18,7 @@ module _3gpp-nr-nrm-gnbdufunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2025-05-07 { reference CR-1527; } + revision 2025-05-07 { reference "CR-1527 CR-1548"; } revision 2025-02-05 { reference CR-1441; } revision 2024-02-24 { reference CR-1218; } revision 2023-09-18 { reference CR-1043 ; } @@ -188,13 +188,12 @@ module _3gpp-nr-nrm-gnbdufunction { } leaf isOnboardSatellite { type boolean; - mandatory false; + default false; description "This attribute indicates whether the function is on board the satellite."; } leaf onboardSatelliteId { type string; - config false; description "This attribute indicates the onboard satellite Id. It shall be formatted as a fixed 5-digit string, padding with leading digits “0” to complete a 5-digit length."; -- GitLab