From ce7330f62a6998ac59993fc3c0233b7196ad6ca2 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 21 Feb 2025 11:45:08 +0000 Subject: [PATCH 01/40] Rel19 CR0508 TS28.623 correction to definitions related to availableRANqoEMetrics for YANG SS --- yang-models/_3gpp-common-qmcjob.yang | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-common-qmcjob.yang b/yang-models/_3gpp-common-qmcjob.yang index b69cd9a19..9d58855f5 100644 --- a/yang-models/_3gpp-common-qmcjob.yang +++ b/yang-models/_3gpp-common-qmcjob.yang @@ -15,7 +15,7 @@ module _3gpp-common-qmcjob { organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Quality of Experience Measurement Collection Job handling - 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.623 Generic Network Resource Model (NRM) @@ -27,6 +27,7 @@ module _3gpp-common-qmcjob { Integration Reference Point (IRP); Information Service (IS)"; + revision 2025-02-06 { reference CR-0508; } revision 2024-11-05 { reference CR-0480; } revision 2024-04-04 { reference CR-0334; } revision 2023-09-18 { reference CR-0271 ; } @@ -138,9 +139,8 @@ module _3gpp-common-qmcjob { leaf-list availableRANqoEMetrics { type enumeration { - enum appLayerBufferLevelList; - enum playoutDelayForMedia; - enum Startup; + enum APP_LAYER_BUFFER_LEVEL_LIST; + enum PLAYOUT_DELAY_FOR_MEDIA_STARTUP; } max-elements 2; description "This parameter indicates available RAN visible QoE metrics -- GitLab From f6e4592cb50a465df44cfab750f2ca4d03e2dfe6 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 31 Jan 2025 14:26:19 +0100 Subject: [PATCH 02/40] 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 4eb51a0d69824b08bf8f6fa83086652bf524ae58 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Tue, 4 Feb 2025 09:31:41 +0100 Subject: [PATCH 03/40] 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 66312d6cd3ec6d882e4c5944eee8b3fddbbd6c90 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Tue, 4 Feb 2025 09:50:55 +0100 Subject: [PATCH 04/40] 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 d646b607701a45a344f84de1ced61bfa9b353cdf Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Tue, 4 Feb 2025 10:04:30 +0100 Subject: [PATCH 05/40] 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 23db97320ce18e6a668b6295f0e99993908b1a60 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 5 Feb 2025 15:15:44 +0100 Subject: [PATCH 06/40] 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 2302b1fd4957d30207f79f1ac6d1d0366f15c634 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 5 Feb 2025 15:25:00 +0100 Subject: [PATCH 07/40] 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 7e5f91c40b2587153ce7d136981f188cd49fb8b6 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 6 Feb 2025 01:12:17 +0100 Subject: [PATCH 08/40] 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 18a88fe00bf5a71a50646cff1919275783f35328 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 6 Feb 2025 15:23:43 +0100 Subject: [PATCH 09/40] 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 3be825c34f2eefbafc4fe33b1d5e4a7b70f21e29 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Thu, 6 Feb 2025 16:17:33 +0100 Subject: [PATCH 10/40] 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 753c03a94654ceee2eb3fc02e1c6c29999373469 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Thu, 6 Feb 2025 16:23:13 +0100 Subject: [PATCH 11/40] 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 481aa4bf9e914b1712996ecdb833dcb0e46549c9 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 6 Feb 2025 18:47:11 +0100 Subject: [PATCH 12/40] 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 90410851f80ff658ad30ded4dcc2ff029c52107d Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Fri, 7 Feb 2025 17:32:12 +0100 Subject: [PATCH 13/40] 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 47cacabce2237f6f2bf7170d5b9cfccad11f5dcf Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 10 Feb 2025 12:18:32 +0100 Subject: [PATCH 14/40] 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 582302affdbe94b79801486ae6e4e09ad43699cd Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 19 Feb 2025 16:31:03 +0100 Subject: [PATCH 15/40] update GeographicalCoordinates remove altitude GeocoordinateGrp add alititude --- yang-models/_3gpp-common-yang-types.yang | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index cfbcd7890..1cc7338f2 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -372,7 +372,7 @@ module _3gpp-common-yang-types { grouping GeographicalCoordinates { description "This datatype represents the geographical coordinates"; - reference "#GPP TS 28.558 clause 6.3.8"; + reference "3GPP TS 28.538 clause 6.3.8"; leaf latitude { type Latitude; @@ -382,12 +382,7 @@ module _3gpp-common-yang-types { leaf longitude { type Longitude; mandatory true; - } - - leaf altitude { - type Altitude; - } - + } } typedef OnOff { @@ -722,6 +717,10 @@ module _3gpp-common-yang-types { global reference frame (WGS 84). Positive values correspond to degrees east of 0 degrees longitude."; } + + leaf altitude { + type Altitude; + } } grouping GeoAreaGrp { -- GitLab From b11aa21a64ab8b4301459ee2a4381aba37be49e7 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 26 Feb 2025 19:05:31 +0100 Subject: [PATCH 16/40] Locally rebased and merged https://forge.3gpp.org/rep/sa5/MnS/-/merge_requests/1578 --- yang-models/_3gpp-common-trace.yang | 806 ++++++++++++++++------------ 1 file changed, 475 insertions(+), 331 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 9b505b336..23152ebf5 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 2025-02-07 { reference "CR-0504"; } revision 2024-11-25 { reference CR-0492; } revision 2024-11-07 { reference "CR-0480"; } revision 2024-10-01 { reference "CR-0457"; } @@ -239,7 +240,7 @@ module _3gpp-common-trace { The attribute traceDepth allows to configure the level of detail of the information which shall be recorded. For trace the reporting is event based, where the triggering event is configured with - attribute triggeringEvent. For each triggering event the first and + attribute triggeringEvents. For each triggering event the first and last message (start/stop triggering event) to record are specified."; list listOfInterfaces { @@ -545,7 +546,7 @@ module _3gpp-common-trace { } } - leaf-list listOfNETypes { + leaf-list listOfNeTypes { type enumeration { enum MSC_SERVER; enum SGSN; @@ -562,12 +563,10 @@ module _3gpp-common-trace { enum GNB_CU_UP; enum GNB_DU; } - description "Specifies in which type of ManagedFunction the trace should + description "Specifies the network element types where the trace should be activated. The attribute is applicable only for Trace with - Signalling Based Trace activation. In case this attribute is not used, - it carries a null semantic"; - reference "Clause 5.4 of 3GPP TS 32.422 for additional details on the - allowed values"; + Signalling Based Trace activation."; + reference "Clause 5.4 of 3GPP TS 32.422. "; } leaf traceDepth { @@ -582,71 +581,177 @@ module _3gpp-common-trace { enum VENDORMAXIMUM; } default MAXIMUM; - description "Specifies how detailed information should be recorded in the - Network Element. The Trace Depth is a paremeter for Trace Session level, - i.e., the Trace Depth is the same for all of the NEs to be traced in - the same Trace Session. - The attribute is applicable only for Trace, otherwise it carries a null - semantic."; - reference "Clause 5.3 of 3GPP TS 32.422"; + description "It specifies the trace depth. The attribute is applicable + only for Trace."; + reference "Clause 5.3 of 3GPP TS 32.422."; } - leaf triggeringEvents { - type enumeration { - enum MO_MT_CALLS; - enum MO_MT_SMS; - enum LU_IMSIattach_IMSIdetach; - enum HANDOVER; - enum SS; - enum PDPcontext; - enum RAU_GPRSattach_GPRSdetach; - enum MBMScontext; - enum CONTEXT; - enum SIPsession_StandaloneTransaction; - enum MBMSactivation; - enum UEinitiatedPDNconnectivityRequest; - enum ServiceRequest; - enum InitialAttach_TAU_Detach; - enum UEinitiatedPDNdisconnection; - enum BearerActivationModificationDeletion; - enum Handover; - enum PDNconnectionCreation; - enum PDNconnectionTermination; - enum Registration; - enum UEderegistration; - enum NetworkDeregistration; - enum UEMobilityFromEPC; - enum UEMobilityToEPC; - enum PDUsessionEstablishment; - enum PDUsessionModification; - enum PDUsessionRelease; - enum PDUsessionUPactivationDeactivation; - enum MobilityBtw3gppAndN3gppTo5GC; - enum MobilityFromEpc; - enum AMpolicy; - enum SMpolicy; - enum Authorization; - enum BDTpolicy; - enum N4Session; - enum UEauthentication; - enum EventExposure; - enum PFDmanagement; - enum ParameterProvision; - enum Trigger; - enum NFmanagement; - enum NFdiscovery; - enum NSSelection; - enum NSSAI; - enum SMservice; - enum UEcontext; - enum SubscriberData; - } + list triggeringEvents { + key idx; description "It specifies the triggering event parameter of the trace - session. The attribute is applicable only for Trace. In case this - attribute is not used, it carries a null semantic. + session. The attribute is applicable only for Trace."; + reference "Clause 5.1 of 3GPP TS 32.422"; + leaf idx { type uint32; } + max-elements 1; - See the clause 5.1 of 3GPP TS 32.422 for additional details on the - allowed values."; + leaf-list MSC_SERVER { + type enumeration { + enum MO_MT_CALLS; + enum MO_MT_SMS; + enum LU_IMSIattach_IMSIdetach; + enum SS; + } + } + + leaf-list SGSN { + type enumeration { + enum PDPcontext; + enum MO_MT_SMS; + enum RAU_GPRSattach_GPRSdetach; + enum MBMScontext; + } + } + + + leaf-list MGW { + type enumeration { + enum CONTEXT; + } + } + + leaf-list GGSN { + type enumeration { + enum PDPcontext; + enum MBMScontext; + } + } + + leaf-list IMS { + type enumeration { + enum SIPsession_StandaloenTransaction; + } + } + + leaf-list BM_SC { + type enumeration { + enum MBMSactivation; + } + } + + leaf-list MME { + type enumeration { + enum UEinitiatedPDNconnectivityRequest; + enum ServiceRequest; + enum InitialAttach_TAU_Detach; + enum UEInitiatedPDNdisconnection; + enum BearerActivationModificationDeletion; + enum Handover; + } + } + + + leaf-list SGW { + type enumeration { + enum PDNconnectionCreation; + enum PDNconnectionTermination; + enum BearerActivationModificationDeletion; + } + } + + leaf-list PGW { + type enumeration { + enum PDNconnectionCreation; + enum PDNconnectionTermination; + enum BearerActivationModificationDeletion; + } + } + + leaf-list AMF { + type enumeration { + enum Registration; + enum ServiceRequest; + enum Handover; + enum UEderegistration; + enum NetworkDeregistration; + enum UEMobilityFromEPC; + enum UEMobilityToEPC; + enum CovergedChargingService; + } + } + + leaf-list SMF { + type enumeration { + enum PDUsessionEstablishment; + enum PDUsessionModification; + enum PDUsessionRelease; + enum PDUsessionUPactivationDeactivation; + enum MobilityBtw3gppAndN3gppTo5GC; + enum MobilityFromEpc; + enum MobilityBtwISMForVSMF; + enum CovergedChargingService; + enum OfflineOnlyCharging; + } + } + + leaf-list PCF { + type enumeration { + enum AMpolicy; + enum SMpolicy; + enum Authorization; + enum BDTpolicy; + enum SpendingLimitControl; + } + } + + leaf-list UPF { + type enumeration { + enum N4Session; + } + } + + leaf-list AUSF { + type enumeration { + enum UEauthentication; + } + } + + leaf-list NEF { + type enumeration { + enum EventExposure; + enum PFDmanagement; + enum ParameterProvisiong; + enum Trigger; + } + } + + leaf-list NRF { + type enumeration { + enum NFmanagement; + enum NFdiscovery; + } + } + + leaf-list NSSF { + type enumeration { + enum NSSelection; + enum NSSAI; + } + } + + leaf-list SMSF { + type enumeration { + enum SMService; + } + } + + leaf-list UDM { + type enumeration { + enum UEcontext; + enum SubscriberData; + enum UEauthentication; + enum EventExposure; + } + } } } @@ -661,14 +766,24 @@ module _3gpp-common-trace { The following attributes are conditional available based on the measurements configured in listOfMeasurements: - -reportInterval: conditional for M1 in LTE or NR and M1/M2 in UMTS, - -reportAmount: conditional for M1 in LTE or NR and M1/M2 in UMTS, - -reportingTrigger: conditional for M1 in LTE or NR and M1/M2 in UMTS, - -eventThreshold: conditional for A2 event reporting or A2 event - triggered periodic reporting, - -collectionPeriodRRMNR: conditional for M4 and M5 in NR, - -collectionPeriodM6NR: conditional for M6 in NR, - -collectionPeriodM7NR: conditional for M7 in NR, + -reportInterval (conditional for M1 in LTE or NR and M1/M2 in UMTS), + -reportAmount (conditional for M1/M2 in UMTS), + -reportAmountM1LTE (conditional for M1 in LTE), + -reportAmountM4LTE (conditional for M4 in LTE), + -reportAmountM5LTE (conditional for M5 in LTE), + -reportAmountM6LTE (conditional for M6 in LTE), + -reportAmountM7LTE (conditional for M7 in LTE), + -reportAmountM1NR (conditional for M1 in NR), + -reportAmountM4NR (conditional for M4 in NR), + -reportAmountM5NR (conditional for M5 in NR), + -reportAmountM6NR (conditional for M6 in NR), + -reportAmountM7NR (conditional for M7 in NR), + -reportingTrigger (conditional for M1 in LTE or NR and M1/M2 in UMTS), + -eventThreshold (conditional for A2 event reporting or A2 event + triggered periodic reporting), + -collectionPeriodRRMNR (conditional for M4 and M5 in NR), + -collectionPeriodM6NR (conditional for M6 in NR), + -collectionPeriodM7NR (conditional for M7 in NR), -collectionPeriodRRMLTE (conditional for M3 in LTE), -measurementPeriodLTE (conditional for M4 and M5 in LTE), -collectionPeriodM6LTE (conditional for M6 in LTE), @@ -710,7 +825,8 @@ module _3gpp-common-trace { - For measurement M2 in LTE or NR, reporting is according to RRM configuration, see TS 38.321, TS 36.321 and TS 38.331, TS 36.331. - For measurement M4 in UMTS, reporting is either according to RRM + + - For measurement M4 in UMTS, reporting is either according to RRM configuration, see TS 25.321 and TS 25.331 or periodic or event triggered periodic using parameter collectionPeriodRRMUMTS and eventThresholdUphUMTS. @@ -724,9 +840,17 @@ module _3gpp-common-trace { is the interval between two measurements (collectionPeriodRRMNR, collectionPeriodM6NR, collectionPeriodM7NR, collectionPeriodRRMLTE, measurementPeriodLte, collectionPeriodM6LTE, collectionPeriodM7LTE, - collectionPeriodRRMUMTS, measurementPeriodUMTS). If no collection - period is configured for M5 in UMTS, all available measurements are - logged according to RRM configuration."; + collectionPeriodRRMUMTS, measurementPeriodUMTS) and the number of + reports (reportAmountM4NR, reportAmountM5NR, reportAmountM6NR, + reportAmountM7NR, reportAmountM4LTE, reportAmountM5LTE, + reportAmountM6LTE,reportAmountM7LTE). If no collection period + is configured for M5 in UMTS, all available measurements are + logged according to RRM configuration. + + - Measurements M8 and M9 in NR or LTE are reported according to + configured M1 and/or M6 related UE measurement reporting. + + "; leaf listOfMeasurements { when '../../../jobType = "IMMEDIATE_MDT_ONLY"'; @@ -746,10 +870,10 @@ module _3gpp-common-trace { enum M8; enum M9; } - description "It specifies the UE measurements that shall be collected in - an Immediate MDT job. The attribute is applicable only for Immediate MDT. - In case this attribute is not used, it carries a null semantic."; - reference "3GPP TS 32.422 clause 5.10.3"; + description "It specifies the UE measurements that shall be + collected in an Immediate MDT job. The attribute is + applicable only for Immediate MDT."; + reference "Clause 5.10.3 of 3GPP TS 32.422."; } leaf reportingTrigger { @@ -767,9 +891,8 @@ module _3gpp-common-trace { should be collected. The attribute is applicable only for Immediate MDT and when the listOfMeasurements is configured for M1 (for both UMTS and LTE) - or M2 (only for UMTS). In case this attribute is not used, it carries - a null semantic."; - reference "Clause 5.10.4 of 3GPP TS 32.422"; + or M2 (only for UMTS)."; + reference "Clause 5.10.4 of 3GPP TS 32.422."; } leaf reportInterval { @@ -785,9 +908,8 @@ module _3gpp-common-trace { description "It specifies the interval between the periodical measurements that shall be taken when the UE is in connected mode. The attribute is applicable only for Immediate MDT and when - reportingTrigger is configured for periodical measurements. In case - this attribute is not used, it carries a null semantic."; - reference "5.10.5 of 3GPP TS 32.422"; + reportingTrigger is configured for periodical measurements."; + reference "5.10.5 of 3GPP TS 32.422."; } leaf reportAmount { @@ -804,8 +926,7 @@ module _3gpp-common-trace { description "It specifies the number of measurement reports that shall be taken for periodic reporting while the UE is in connected. The attribute is applicable only for Immediate MDT and when - reportingTrigger is configured for periodical measurements. In - case this attribute is not used, it carries a null semantic."; + reportingTrigger is configured for periodical measurements."; reference "Clause 5.10.6 of 3GPP TS 32.422"; } @@ -815,8 +936,7 @@ module _3gpp-common-trace { description "Specifies the threshold which should trigger the reporting in case A2 event reporting in LTE or 1F/1l event in UMTS. The attribute is applicable only for Immediate MDT and when reportingTrigger is - configured for A2 event in LTE or 1F event or 1l event in UMTS. In - case this attribute is not used, it carries a null semantic."; + configured for A2 event in LTE or 1F event or 1l event in UMTS."; reference "Clauses 5.10.7 and 5.10.7a of 3GPP TS 32.422"; } @@ -829,8 +949,7 @@ module _3gpp-common-trace { units milliseconds; description "Specifies the collection period for collecting RRM configured measurement samples for M4, M5 in NR. The attribute is - applicable only for Immediate MDT. In case this attribute is not - used, it carries a null semantic."; + applicable only for Immediate MDT."; reference "Clause 5.10.30 of 3GPP TS 32.422"; } @@ -855,8 +974,7 @@ module _3gpp-common-trace { } description "It specifies the collection period for the Packet Delay measurement (M6) for NR MDT taken by the gNB. The attribute is - applicable only for Immediate MDT. In case this attribute is not used, - it carries a null semantic."; + applicable only for Immediate MDT. "; reference "clause 5.10.34 of TS 32.422"; } @@ -868,40 +986,47 @@ module _3gpp-common-trace { } description "It specifies the collection period for the Packet Loss Rate measurement (M7) for NR MDT taken by the gNB. The attribute is - applicable only for Immediate MDT. In case this attribute is not used, - it carries a null semantic."; + applicable only for Immediate MDT."; reference "clause 5.10.35 of TS 32.422"; } leaf collectionPeriodRRMLTE { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; - type uint32 { - range "250|500|1000|2000|3000|4000|6000|8000|12000|16000|20000|" - +"24000|28000|32000|64000"; + type enumeration { + enum 100ms; + enum 1000ms; + enum 1024ms; + enum 1280ms; + enum 2048ms; + enum 2560ms; + enum 5120ms; + enum 10000ms; + enum 10240ms; + enum 1min; } - units milliseconds; description "Specifies the collection period for collecting RRM configured - measurement samples for M2, M3 in LTE. The attribute is applicable only - for Immediate MDT. In case this attribute is not used, it carries a - null semantic."; - reference "Clause 5.10.20 of 3GPP TS 32.422"; + measurement samples for M3 in LTE. The attribute is applicable only + for Immediate MDT."; + reference "Clause 5.10.20 of 3GPP TS 32.422."; } leaf measurementPeriodLTE { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; - type uint32 { - range "1024|1280|2048|2560|5120|" - +"10240|60000"; + type enumeration { + enum 1024ms; + enum 2048ms; + enum 5120ms; + enum 10240ms; + enum 1min; } - units milliseconds; mandatory true; - description "It specifies the measurement period for the Data Volume and - Scheduled IP throughput measurements for MDT taken by the eNB. - The attribute is applicable only for Immediate MDT. In case this - attribute is not used, it carries a null semantic."; - reference "Clause 5.10.23 of 3GPP TS 32.422"; + description "It specifies the measurement period for the + Data Volume (M4) and Scheduled IP throughput + measurements (M5) for LTE MDT taken by the eNB. + The attribute is applicable only for Immediate MDT."; + reference "Clause 5.10.23 of 3GPP TS 32.422."; } leaf collectionPeriodM6LTE { @@ -915,7 +1040,7 @@ module _3gpp-common-trace { measurement (M6) for MDT taken by the eNB. The attribute is applicable only for Immediate MDT. In case this attribute is not used, it carries a null semantic."; - reference "Clause 5.10.32 of TS 32.422 "; + reference "Clause 5.10.32 of TS 32.422. "; } leaf collectionPeriodM7LTE { @@ -926,9 +1051,8 @@ module _3gpp-common-trace { } description "It specifies the collection period for the Packet Loss Rate measurement (M7) for LTE MDT taken by the eNB. The attribute is - applicable only for Immediate MDT. In case this attribute - is not used, it carries a null semantic."; - reference "Clause 5.10.33 of TS 32.422 ."; + applicable only for Immediate MDT."; + reference "Clause 5.10.33 of TS 32.422."; } leaf eventThresholdUphUMTS { @@ -939,35 +1063,32 @@ module _3gpp-common-trace { } description "It specifies the threshold which should trigger the reporting in case of event-triggered periodic reporting for M4 - (UE power headroom measurement) in UMTS. In case this attribute is - not used, it carries a null semantic."; - reference "5.10.39 of TS 32.422"; + (UE power headroom measurement) in UMTS."; + reference "Clause 5.10.39 of TS 32.422."; } leaf collectionPeriodRRMUMTS { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + ' or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { - range "1024|1280|2048|2560|5120|" - +"10240|60000"; + range "100|250|500|1000|2000|" + +"3000|4000|6000"; } units milliseconds; description "Specifies the collection period for collecting RRM configured measurement samples for M3, M4, M5 in UMTS. The attribute is applicable - only for Immediate MDT. In case this attribute is not used, it carries - a null semantic"; - reference "Clause 5.10.21 of 3GPP TS 32.422"; + only for Immediate MDT. "; + reference "Clause 5.10.21 of 3GPP TS 32.422."; } leaf measurementPeriodUMTS { when '../../../jobType = "IMMEDIATE_MDT_ONLY"' + 'or ../../../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type uint32 { - range "250|500|1000|2000|3000|4000|6000|8000|12000|16000|20000|" + range "1000|2000|3000|4000|6000|8000|12000|16000|20000|" +"24000|28000|32000|64000"; } units milliseconds; - mandatory true; description "It specifies the measurement period for the Data Volume and Throughput measurements for MDT taken by RNC. The attribute is applicable only for Immediate MDT. In case this @@ -985,7 +1106,7 @@ module _3gpp-common-trace { } description "It specifies the measurements that are collected in an MDT job for a UMTS MDT configured for event triggered reporting."; - reference "Clause 5.10.15 of 3GPP TS 32.422"; + reference "Clause 5.10.15 of 3GPP TS 32.422."; } leaf beamLevelMeasurement { @@ -995,7 +1116,7 @@ module _3gpp-common-trace { default false; description "Indicates whether the NR M1 beam level measurements shall be included or not."; - reference "Clause 5.10.40 of TS 32.422"; + reference "Clause 5.10.40 of 3GPP TS 32.422."; } leaf positioningMethod { @@ -1007,7 +1128,7 @@ module _3gpp-common-trace { } description "It specifies what positioning method should be used in the MDT job."; - reference "Clause 5.10.19 of 3GPP TS 32.422"; + reference "Clause 5.10.19 of 3GPP TS 32.422."; } list excessPacketDelayThresholds { @@ -1033,10 +1154,8 @@ module _3gpp-common-trace { taken for periodic reporting while the UE is in connected mode. The attribute is applicable only for Immediate MDT and combined Trace and Immediate MDT and when reportingTrigger is configured for periodical - measurements and applicable only for LTE. In case this attribute is not - used, it carries a null semantic. - See the clause 5.10.6 of TS 32.422 for additional details on the - allowed values."; + measurements and applicable only for LTE."; + reference "Clause 5.10.19 of 3GPP TS 32.422."; } leaf reportAmountM4LTE { @@ -1051,13 +1170,11 @@ module _3gpp-common-trace { enum INFINITY; } description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical - measurements and applicable only for LTE. In case this attribute is not - used, it carries a null semantic. - See the clause 5.10.6 of TS 32.422 for additional details on the - allowed values."; + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for LTE."; + reference "Clause 5.10.6 of TS 32.422."; } leaf reportAmountM5LTE { @@ -1072,13 +1189,11 @@ module _3gpp-common-trace { enum INFINITY; } description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical - measurements and applicable only for LTE. In case this attribute is not - used, it carries a null semantic. - See the clause 5.10.6 of TS 32.422 for additional details on the - allowed values."; + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for LTE."; + reference "Clause 5.10.6 of TS 32.422."; } leaf reportAmountM6LTE { @@ -1093,13 +1208,11 @@ module _3gpp-common-trace { enum INFINITY; } description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical - measurements and applicable only for LTE. In case this attribute is not - used, it carries a null semantic. - See the clause 5.10.6 of TS 32.422 for additional details on the - allowed values."; + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for LTE."; + reference "Clause 5.10.6 of TS 32.422."; } leaf reportAmountM7LTE { @@ -1114,13 +1227,11 @@ module _3gpp-common-trace { enum INFINITY; } description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical - measurements and applicable only for LTE. In case this attribute is not - used, it carries a null semantic. - See the clause 5.10.6 of TS 32.422 for additional details on the - allowed values."; + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for LTE."; + reference "Clause 5.10.6 of TS 32.422."; } leaf reportAmountM1NR { @@ -1135,13 +1246,11 @@ module _3gpp-common-trace { enum INFINITY; } description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical - measurements and applicable only for NR. In case this attribute is not - used, it carries a null semantic. - See the clause 5.10.6 of TS 32.422 for additional details on the - allowed values."; + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for NR."; + reference "Clause 5.10.6 of TS 32.422."; } leaf reportAmountM4NR { @@ -1156,13 +1265,11 @@ module _3gpp-common-trace { enum INFINITY; } description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical - measurements and applicable only for NR. In case this attribute is not - used, it carries a null semantic. - See the clause 5.10.6 of TS 32.422 for additional details on the - allowed values."; + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for NR."; + reference "Clause 5.10.6 of TS 32.422."; } leaf reportAmountM5NR { @@ -1177,13 +1284,11 @@ module _3gpp-common-trace { enum INFINITY; } description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical - measurements and applicable only for NR. In case this attribute is not - used, it carries a null semantic. - See the clause 5.10.6 of TS 32.422 for additional details on the - allowed values."; + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for NR."; + reference "Clause 5.10.6 of TS 32.422."; } leaf reportAmountM6NR { @@ -1198,13 +1303,11 @@ module _3gpp-common-trace { enum INFINITY; } description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical - measurements and applicable only for NR. In case this attribute is not - used, it carries a null semantic. - See the clause 5.10.6 of TS 32.422 for additional details on the - allowed values."; + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for NR."; + reference "Clause 5.10.6 of TS 32.422."; } leaf reportAmountM7NR { @@ -1219,48 +1322,58 @@ module _3gpp-common-trace { enum INFINITY; } description "It specifies the number of measurement reports that shall be - taken for periodic reporting while the UE is in connected mode. - The attribute is applicable only for Immediate MDT and combined Trace - and Immediate MDT and when reportingTrigger is configured for periodical - measurements and applicable only for NR. In case this attribute is not - used, it carries a null semantic. - See the clause 5.10.6 of TS 32.422 for additional details on the - allowed values."; + taken for periodic reporting while the UE is in connected mode. + The attribute is applicable only for Immediate MDT and combined Trace + and Immediate MDT and when reportingTrigger is configured for periodical + measurements and applicable only for NR."; + reference "Clause 5.10.6 of TS 32.422."; } } grouping LoggedMdtConfigGrp { description "This <> defines the configuration parameters of - IOC TraceJob which are specific for Logged MDT or Logged MBSFN MDT. - The optional attribute plmnList allows to specify the PLMNs where - measurement collection, status indication and log reporting is allowed, - the optional attribute areaConfigurationForNeighCell allows to specify - the area for which UE is requested to perform measurements logging for - neighbour cells which have list of frequencies. For logged MDT in UMTS - and LTE, the reporting is periodical. Parameter loggingInterval determines - the interval between the reports and parameter loggingDuration determines - how long the configuration is valid meaning after this duration has passed - no further reports are sent. In NR, the reporting can be periodical or event - based, determined by parameter reportType. For periodical reporting the - same parameters as in LTE and UMTS apply. For event based reporting, - parameter eventListForEventTriggeredMeasurement configures the event type, - namely 'out of coverage' or 'L1 event'. In case 'L1 event' is selected as - event type, the logging is performed according to parameter loggingInterval - at regular intervals only when the conditions indicated by eventThresholdL1, - hysteresisL1, timeToTriggerL1 (defining the thresholds, hysteresis and time - to trigger) are met and if UE is 'camped normally' state (TS 38.331, - TS 38.304). In case 'out of coverage' is selected as event type, the - logging is performed according to parameter loggingInterval at regular - intervals only when the UE is in 'any cell selection' state. - Furthermore, logging is performed immediately upon transition from the - 'any cell selection' state to the 'camped normally' state (TS 38.331, - TS 38.304)."; + IOC TraceJob which are specific for Logged MDT or Logged MBSFN MDT. + + Based on the value configured for attribute jobType in IOC TraceJob, + different attributes are available. In case of LOGGED_MDT_ONLY, the + attributes reportType, eventListForEventTriggeredMeasurement, + eventThresholdL1, hysteresisL1, timeToTriggerL1, + areaConfigurationForNeighCells and npnIdentityList are applicable. + In case of LOGGED_MBSFN_MDT, + the attribute mbsfnAreaList is applicable. The optional attribute + plmnList allows to specify the PLMNs where + measurement collection, status indication and log reporting is + allowed, the optional attribute areaConfigurationForNeighCell + allows to specify the area for which UE is requested to perform + measurements logging for neighbour cells which have list of + frequencies. + + For logged MDT in UMTS and LTE, the reporting is periodical. Parameter + loggingInterval determines the interval between the reports and parameter + loggingDuration determines how long the configuration is valid meaning + after this duration has passed no further reports are sent. In NR, the + reporting can be periodical or event based, determined by parameter + reportType. For periodical reporting the same parameters as in LTE and + UMTS apply. For event based reporting, + parameter eventListForEventTriggeredMeasurement configures the event type, + namely 'out of coverage' or 'L1 event'. In case 'L1 event' is selected as + event type, the logging is performed according to parameter loggingInterval + at regular intervals only when the conditions indicated by + eventThresholdL1, hysteresisL1, timeToTriggerL1 (defining the thresholds, + hysteresis and time to trigger) are met and if UE is 'camped normally' + state (TS 38.331, + TS 38.304). In case 'out of coverage' is selected as event type, the + logging is performed according to parameter loggingInterval at regular + intervals only when the UE is in 'any cell selection' state. + Furthermore, logging is performed immediately upon transition from the + 'any cell selection' state to the 'camped normally' state (TS 38.331, + TS 38.304)."; leaf traceCollectionEntityId { type int64; description "It specifies the TCE Id which is sent to the UE in - Logged MDT. See the clause 5.10.11 of 3GPP TS 32.422 for additional - details on the allowed values."; + Logged MDT."; + reference "Clause 5.10.11 of 3GPP TS 32.422."; } leaf loggingDuration { @@ -1272,24 +1385,29 @@ module _3gpp-common-trace { units seconds; description "Specifies how long the MDT configuration is valid at the UE in case of Logged MDT. The attribute is applicable only for - Logged MDT and Logged MBSFN MDT. In case this attribute is not used, it - carries a null semantic."; - reference "5.10.9 of 3GPP TS 32.422"; + Logged MDT and Logged MBSFN MDT."; + reference "Clause 5.10.9 of 3GPP TS 32.422"; } leaf loggingInterval { when '../../../jobType = "LOGGED_MDT_ONLY" or' + ' ../../../jobType = "LOGGED_MBSFN_MDT"'; - type uint32 { - range "0|320|640|1280|2560|5120|10240|20480|" - +"30720|40960|61440"; + type enumeration { + enum 320ms; + enum 640ms; + enum 1280ms; + enum 2560ms; + enum 5120ms; + enum 10240ms; + enum 20480ms; + enum 30720ms; + enum 40960ms; + enum 61440ms; + enum INFINITY; } - units milliseconds; description "Specifies the periodicty for Logged MDT. The attribute is - applicable only for Logged MDT and Logged MBSFN MDT. In case this - attribute is not used, it carries a null semantic. - The value 0 indicates Infinity for NR."; - reference "5.10.8 of 3GPP TS 32.422"; + applicable only for Logged MDT and Logged MBSFN MDT."; + reference "Clause 5.10.8 of 3GPP TS 32.422"; } leaf reportType { @@ -1299,7 +1417,7 @@ module _3gpp-common-trace { enum EVENT_TRIGGERED; } description "It specifies report type for logged NR MDT"; - reference "Clause 5.10.27 of 3GPP TS 32.422"; + reference "Clause 5.10.27 of 3GPP TS 32.422."; } leaf eventListForEventTriggeredMeasurement { @@ -1314,7 +1432,7 @@ module _3gpp-common-trace { condition being fulfilled: - Out of coverage. - A2 event."; - reference "Clause 5.10.28 of 3GPP TS 32.422"; + reference "Clause 5.10.28 of 3GPP TS 32.422."; } leaf eventThresholdL1 { @@ -1327,8 +1445,7 @@ module _3gpp-common-trace { the reporting in case of event based reporting of logged NR MDT. The attribute is applicable only for Logged MDT and when reportType is configured for event triggered reporting and when - eventListForEventTriggeredMeasurement is configured for L1 event. - In case this attribute is not used, it carries a null semantic."; + eventListForEventTriggeredMeasurement is configured for L1 event."; reference "clause 5.10.36 of TS 32.422"; } @@ -1342,8 +1459,7 @@ module _3gpp-common-trace { condition of the L1 event based reporting of logged NR MDT. The attribute is applicable only for Logged MDT, when reportType is configured for event triggered reporting and when - eventListForEventTriggeredMeasurement is configured for L1 event. - In case this attribute is not used, it carries a null semantic."; + eventListForEventTriggeredMeasurement is configured for L1 event."; reference "clause 5.10.37 of TS 32.422"; } @@ -1358,19 +1474,18 @@ module _3gpp-common-trace { the reporting in case of event based reporting of logged NR MDT. The attribute is applicable only for Logged MDT, when reportType is configured for event triggered reporting and when - eventListForEventTriggeredMeasurement is configured for L1 event. - In case this attribute is not used, it carries a null semantic."; - reference "clauses 5.10.38 of TS 32.422"; + eventListForEventTriggeredMeasurement is configured for L1 event."; + reference "clause 5.10.38 of TS 32.422"; } - list pLMNList { + 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"; + reference "Clause 5.10.24 of 3GPP TS 32.422."; } list areaConfigurationForNeighCells { @@ -1383,7 +1498,7 @@ module _3gpp-common-trace { all the neighbour cells. Applicable only to NR Logged MDT."; - reference "3GPP TS 32.422 clause 5.10.26."; + reference "Clause 5.10.26 of 3GPP TS 32.422."; uses AreaConfigGrp; } @@ -1395,7 +1510,7 @@ module _3gpp-common-trace { description "The MBSFN Area consists of a MBSFN Area ID and Carrier Frequency (EARFCN). The target MBSFN area List can have up to 8 entries. This parameter is applicable only if the job type is Logged MBSFN MDT."; - reference "5.10.25 of 3GPP TS 32.422"; + reference "Clause 5.10.25 of 3GPP TS 32.422."; uses MbsfnAreaGrp; } @@ -1403,7 +1518,8 @@ module _3gpp-common-trace { list nPNIdentityList { description "It defines which NPNs that can be served by the NR cell, and which CAG IDs or NIDs can be supported by the NR cell for - corresponding PNI-NPN or SNPN."; + corresponding PNI-NPN or SNPN in case of the cell is NPN-only cell. + (NPN-Identity referring to TS 38.331)"; key idx; max-elements 1; uses types3gpp:NpnIdGrp; @@ -1432,8 +1548,9 @@ module _3gpp-common-trace { enum TAC_OF_IMEI; } default NO_IDENTITY; - description "Specifies level of MDT anonymization."; - reference "3GPP TS 32.422 clause 5.10.12."; + description "Specifies level of anonymization of MDT data. + This attribute is only applicable for management based activation."; + reference "Clause 5.10.12 of 3GPP TS 32.422"; } list areaScope { @@ -1451,17 +1568,13 @@ module _3gpp-common-trace { enum UE_ORIENTATION; } description "It specifies which sensor information shall be included in - logged NR MDT and immediate NR MDT measurement if they are available. - The following sensor measurement can be included or excluded for - the UE."; - reference "Clause 5.10.29 of 3GPP TS 32.422"; + logged NR MDT and immediate NR MDT measurement if they are available."; + reference "Clause 5.10.29 of 3GPP TS 32.422."; } list immediateMdtConfig { description "The set of parameters specific for Immediate MDT - configuration. - This attribute shall be present only if MDT is supported and the jobType - attribute is set to Immediate MDT or combined Trace and Immediate MDT"; + configuration."; key idx; max-elements 1; leaf idx { type string; } @@ -1470,9 +1583,7 @@ module _3gpp-common-trace { list loggedMdtConfig { description "The set of parameters specific for Logged MDT and Logged - MBSFN MDT configuration. - This attribute shall be present only if MDT is supported and the - jobType attribute is set to Logged MDT or Logged MBSFN MDT."; + MBSFN MDT configuration."; key idx; max-elements 1; leaf idx { type string; } @@ -1504,12 +1615,12 @@ module _3gpp-common-trace { For 5GC UE level measurements defined in TS 28.558, the name is constructed as follows: - - 'family.measurementName.subcounter' for measurement type with + 'family.measurementName.subcounter' for measurement type with specified subcounter - - 'family.measurementName.ALL' for measurement type with all supported + 'family.measurementName.ALL' for measurement type with all supported subcounters - - 'family.measurementName' for measurement type without subcounters - - 'family' for measurement family, including all measurement types and + 'family.measurementName' for measurement type without subcounters + 'family' for measurement family, including all measurement types and the associated subcounters under this family. For non-3GPP specified 5GC UE level measurements the name is defined elsewhere."; @@ -1519,7 +1630,7 @@ module _3gpp-common-trace { type uint32; mandatory true; units milliseconds; - description "It specifies the Granularity period used to produce 5GC UE + description "Granularity period used to produce 5GC UE level measurements. The period is defined in milliseconds (ms)."; } @@ -1536,12 +1647,16 @@ module _3gpp-common-trace { leaf-list objectInstances { type string; - description "List of object instances."; + description "List of object instances. + Each object instance is identified by its DN."; } leaf-list rootObjectInstances { type string; - description "List of root object instances."; + description "List of root object instances. + Each object instance is identified by its DN and designates + the root of a substree that contains the root object and all + descendant objects."; } } @@ -1563,15 +1678,11 @@ module _3gpp-common-trace { enum RRC_REPORT; } default TRACE_ONLY; - description "Specifies the MDT mode and it specifies also whether the - TraceJob represents only MDT, Logged MBSFN MDT, Trace, or 5GC UE - level measurement collection, or any combination - of Trace, immediate MDT and 5GC UE level measurement collection or RRC - reporting. - The attribute is applicable for Trace, MDT, RCEF, RRC and - RLF reporting, and 5GC UE level measurement collection."; - reference "Clause 5.9a of 3GPP TS 32.422 for additional details on the - allowed values."; + description "It specifies whether the + TraceJob represents only MDT, Trace, RLF, RCEF, RRC or 5GC UE + level measurements job, or a combined job. It also defines the + MDT mode."; + reference "Clause 5.9a of 3GPP TS 32.422."; } leaf-list rrcReportType { type enumeration { @@ -1583,15 +1694,13 @@ module _3gpp-common-trace { enum RA_REPORT; } description "Specifies the RRC reports requested. "; - reference "Clause 5.14 of 3GPP TS 32.422 for additional details on the - allowed values."; + reference "3GPP TS 38.331"; } list pLMNTarget { key "mcc mnc"; - description "Specifies which PLMN that the subscriber of the session to - be recorded uses as selected PLMN. PLMN Target might differ from the - PLMN specified in the Trace Reference"; + description "It specifies which PLMN that the subscriber of the session to + be recorded uses as selected PLMN."; reference "Clause 5.9b of 3GPP TS 32.422"; uses types3gpp:PLMNId; @@ -1601,7 +1710,14 @@ module _3gpp-common-trace { when '../jobType = "TRACE_ONLY"' + ' or ../jobType = "IMMEDIATE_MDT_AND_TRACE"'; type string; - description "Specifies the metrics to be reported."; + description "List of trace metrics identified by name. + Includes trace messages, MDT measurements (Immediate MDT, + Logged MDT, Logged MBSFN MDT), RLF, RCEF and RRC reports, + see TS 32.422 Trace messages are identified with their message + identifier. Trace metric identifier is constructed as defined + in clause 10 of TS 32.422. + For non-3GPP specified trace metrics the name is defined elsewhere. +"; reference "Clause 10 of 3GPP TS 32.422"; } @@ -1610,9 +1726,8 @@ module _3gpp-common-trace { description "It specifies the address of the Trace Collection Entity when the attribute traceReportingFormat is configured for the file-based reporting. The attribute is applicable for both Trace and - MDT. - See the clause 5.9 of TS 32.422 for additional details on the allowed - values."; + MDT."; + reference "Clause 5.9 of 3GPP TS 32.422."; } @@ -1621,7 +1736,7 @@ module _3gpp-common-trace { type inet:uri; description "URI of the Streaming Trace data reporting MnS consumer (a.k.a. streaming target)."; - reference "Clause 5.9 of 3GPP TS 32.422"; + reference "Clause 5.9 of 3GPP TS 32.422."; } list traceReference { @@ -1633,7 +1748,7 @@ module _3gpp-common-trace { In case of shared network, it is the MCC and MNC of the Participating Operator that request the trace session that shall be provided. The attribute is applicable for both Trace and MDT."; - reference "Clause 5.6 of 3GPP TS 32.422"; + reference "Clause 5.6 of 3GPP TS 32.422."; leaf idx { type uint32 ; } uses trace3gpp:TraceReferenceGrp ; @@ -1685,13 +1800,21 @@ module _3gpp-common-trace { 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. The traceTarget shall be - cell only in case of the UTRAN cell traffic trace function. + 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 E-UtranCell only in case of E-UTRAN cell - traffic trace function.The traceTarget shall be either IMSI or - IMEI(SV) if the Trace Session is activated to any of the following + 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 @@ -1700,28 +1823,39 @@ module _3gpp-common-trace { - BmscFunction - RncFunction - MmeFunction - - The traceTarget shall be IMSI if the Trace Session is activated to a - ManagedEntity playing a role of ServinGWFunction. - - In case of signaling based Trace/MDT, the traceTarget attribute shall - be able to carry (IMSI or IMEI(SV)or SUPI), the areaScope attribute - shall be able to carry a list of (cell or E-UtranCell or NRCellDU or - TA/LA/RA). - - In case of management based Immediate MDT, the traceTarget attribute - shall be null value, the areaScope attribute shall carry a list of - (Utrancell or E-UtranCell or NRCellDU). - - In case of management based Logged MDT, the traceTarget attribute - shall carry an eBs or a RNC or gNBs. The Logged MDT should be initiated - on the specified eNB or RNC or gNB in traceTarget. The areaScope - attribute shall carry a list of (Utrancell or E-UtranCell or NRCellDU or - TA/LA/RA). - - In case of RLF reporting, or RCEF reporting, the traceTarget - attribute shall be null value, the areaScope attribute shall carry - one or list of eNBs/gNBs"; + - 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"; } @@ -1781,7 +1915,7 @@ module _3gpp-common-trace { grouping TraceSubtree { description "Contains classes that manage Tracing. Should be used in all classes (or classes inheriting from) - - SubNnetwork + - SubNetwork - ManagedElement - ManagedFunction @@ -1833,18 +1967,28 @@ module _3gpp-common-trace { Session is activated different types of the target object are possible. The attribute pLMNTarget defines the PLMN for which sessions shall be selected in the Trace Session in case of management based activation - when several PLMNs are supported in the RAN. - - The attribute jobType specifies the kind of data to collect. In case of - Trace only, the configuration parameters of attribute traceConfig shall - be applied. In case of Immediate MDT only, Logged MDT only, RLF reports - only, RCEF reports only and Logged MBSFN MDT, the configuration - parameters of attribute mdtConfig or a subset of these shall be - applied. In case of UE measurements only, the configuration parameters + when several PLMNs are supported in the RAN.The MDT configuration may + include area scope defined by network slice, in which case + the attribute pLMNTarget is not applicable. + + The attribute listOfTraceMetrics allows configuraton of which metrics + shall be recorded. + + The attribute jobType specifies the kind of data to collect. In case of + TRACE_ONLY, the configuration parameters of attribute traceConfig + shall be applied. In case of IMMEDIATE_MDT_ONLY, LOGGED_MDT_ONLY, + RLF_REPORT_ONLY, RCEF_REPORT_ONLY and LOGGED_MBSFN_MDT the + configuration parameters of + attribute mdtConfig or a subset of these shall be applied. In case of + 5GC_UE_LEVEL_MEASUREMENTS_ONLY, the configuration parameters of attribute ueCoreMeasConfig shall be applied. In case of any - combination of Trace, Immediate MDT, Trace and UE measurements, the - configuration parameters of the corresponding attributes traceConfig, - mdtConfig and ueCoreMeasConfig are applicable. + combination of Trace, Immediate MDT, and 5GC UE level measurements, + the configuration parameters + of the corresponding attributes, traceConfig, mdtConfig and + ueCoreMeasConfig are applicable. + + If jobType has the value RRC Report, the attribute rrcReportType shall + bepresent. The rrcReportType allows the tracing of RRC reports. Creation and deletion of TraceJob instances by MnS consumers is optional; when not supported, the TraceJob instances may be created -- GitLab From 07028b206fc770b376f162aeb8fc8c3a53efe567 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 7 Feb 2025 16:24:40 +0000 Subject: [PATCH 17/40] Update _3gpp-nr-nrm-ntnfunction.yang --- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 67 ++++++++++++++++++++++- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index 5abe98f62..896879c28 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -9,16 +9,20 @@ module _3gpp-nr-nrm-ntnfunction { import ietf-yang-types { prefix yang; } import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } + import _3gpp-common-yang-types { prefix typesyang; } + organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Implements support the C-SON function of Capacity and Coverage optimization . - 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-29 { reference CR-1479 ; } revision 2024-05-24 { reference CR-1273 ; } + feature NTNFunctionUnderSubNetwork { description "The NTNFunction shall be contained under SubNetwork"; @@ -241,6 +245,62 @@ module _3gpp-nr-nrm-ntnfunction { } } + grouping NTNEntityConfigGrp { + description ""; + + leaf nTNConfEntity { + type types3gpp:DistinguishedName; + min-elements 1; + description "Specifies the DN of a specific NTN related MOI. + allowedValues: DN of of the following MOIs: + EP_NgC, NRCellCU, NRCellDU, NRSectorCarrier, + SectorEquipmentFunction, NRCellRelation."; + } + + leaf-list nTNEntityConfigRefList { + type typesyang:nameValuePair ; + min-elements 0; + description "Specifies the list of configuration parameters and values. + The content of the attribute is a list of attributeName- attributeValue + pairs. AttributeValues may be complex types."; + } + + } + + + grouping NTNTimeBasedConfigGrp { + description "This IOC represents a configuration to be applied during + a specified time window. + The attribute timeWindow specifies the time window during which the + specified configuration is applied. + The attribute nTNEntityRefList specifies MOI(s) to be used during the + specified timeWindow. + The attribute nTNEntityConfigList specifies configuration updates applied + to MOI(s) during the specified timeWindow."; + + leaf timeWindow { + type types3gpp:TimeWindowGrp; + config true; + description "It defines the time window."; + } + + leaf-list nTNEntityRefList { + type types3gpp:DistinguishedName; + min-elements 0; + description "It contains a list of NTN related MOIs. + allowedValues: DN of of the following MOIs: + EP_NgC, NRCellCU, NRCellDU, NRSectorCarrier, + SectorEquipmentFunction, NRCellRelation."; + } + + leaf-list nTNEntityConfigRefList { + uses NTNEntityConfigGrp; + min-elements 0; + description "It contains a list of configuration + updates to be applied to specified NTN entities."; + } + } + grouping NTNFunctionGrp { description "Represents the NTNFunction IOC"; @@ -270,7 +330,10 @@ module _3gpp-nr-nrm-ntnfunction { grouping NTNFunctionSubtreeGrp { list NTNFunction { description "This IOC contains attributes to support the non-terrestrial - NR access."; + 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."; key id; max-elements 1; uses top3gpp:Top_Grp; -- GitLab From f39a2bcccac130e654224bd6375595745eb4a3ec Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 7 Feb 2025 16:29:42 +0000 Subject: [PATCH 18/40] Update _3gpp-nr-nrm-ntnfunction.yang --- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index 896879c28..e2f600715 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -10,6 +10,7 @@ module _3gpp-nr-nrm-ntnfunction { import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } import _3gpp-common-yang-types { prefix typesyang; } + import _3gpp-common-yang-types { prefix types3gpp; } organization "3gpp SA5"; @@ -257,14 +258,14 @@ module _3gpp-nr-nrm-ntnfunction { SectorEquipmentFunction, NRCellRelation."; } - leaf-list nTNEntityConfigRefList { - type typesyang:nameValuePair ; - min-elements 0; + list nTNEntityConfigRefList { + key name; + config false ; + yext3gpp:notNotifyable; description "Specifies the list of configuration parameters and values. The content of the attribute is a list of attributeName- attributeValue pairs. AttributeValues may be complex types."; - } - + } } -- GitLab From 6bca4c541365216afaf0f812e0c331471f70934e Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 7 Feb 2025 16:41:53 +0000 Subject: [PATCH 19/40] Update _3gpp-nr-nrm-ntnfunction.yang --- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index e2f600715..e55c8e448 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -9,10 +9,8 @@ module _3gpp-nr-nrm-ntnfunction { import ietf-yang-types { prefix yang; } import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-subnetwork { prefix subnet3gpp; } - import _3gpp-common-yang-types { prefix typesyang; } import _3gpp-common-yang-types { prefix types3gpp; } - organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Implements support the C-SON function of Capacity and @@ -251,7 +249,6 @@ module _3gpp-nr-nrm-ntnfunction { leaf nTNConfEntity { type types3gpp:DistinguishedName; - min-elements 1; description "Specifies the DN of a specific NTN related MOI. allowedValues: DN of of the following MOIs: EP_NgC, NRCellCU, NRCellDU, NRSectorCarrier, @@ -260,15 +257,14 @@ module _3gpp-nr-nrm-ntnfunction { list nTNEntityConfigRefList { key name; - config false ; - yext3gpp:notNotifyable; + config true; + uses types3gpp:nameValuePair description "Specifies the list of configuration parameters and values. The content of the attribute is a list of attributeName- attributeValue pairs. AttributeValues may be complex types."; } } - grouping NTNTimeBasedConfigGrp { description "This IOC represents a configuration to be applied during a specified time window. @@ -280,7 +276,7 @@ module _3gpp-nr-nrm-ntnfunction { to MOI(s) during the specified timeWindow."; leaf timeWindow { - type types3gpp:TimeWindowGrp; + uses types3gpp:TimeWindowGrp; config true; description "It defines the time window."; } -- GitLab From 8638598694105e78916f991ebf4f0b1abc6684e7 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 7 Feb 2025 16:43:58 +0000 Subject: [PATCH 20/40] Update _3gpp-nr-nrm-ntnfunction.yang --- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 36 +++++++++++------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index e55c8e448..cc14c83cd 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -250,31 +250,31 @@ module _3gpp-nr-nrm-ntnfunction { leaf nTNConfEntity { type types3gpp:DistinguishedName; description "Specifies the DN of a specific NTN related MOI. - allowedValues: DN of of the following MOIs: - EP_NgC, NRCellCU, NRCellDU, NRSectorCarrier, - SectorEquipmentFunction, NRCellRelation."; + allowedValues: DN of of the following MOIs: + EP_NgC, NRCellCU, NRCellDU, NRSectorCarrier, + SectorEquipmentFunction, NRCellRelation."; } list nTNEntityConfigRefList { key name; config true; - uses types3gpp:nameValuePair + uses types3gpp:nameValuePair; description "Specifies the list of configuration parameters and values. - The content of the attribute is a list of attributeName- attributeValue - pairs. AttributeValues may be complex types."; + The content of the attribute is a list of attributeName- attributeValue + pairs. AttributeValues may be complex types."; } } grouping NTNTimeBasedConfigGrp { description "This IOC represents a configuration to be applied during - a specified time window. - The attribute timeWindow specifies the time window during which the - specified configuration is applied. - The attribute nTNEntityRefList specifies MOI(s) to be used during the - specified timeWindow. - The attribute nTNEntityConfigList specifies configuration updates applied - to MOI(s) during the specified timeWindow."; - + a specified time window. + The attribute timeWindow specifies the time window during which the + specified configuration is applied. + The attribute nTNEntityRefList specifies MOI(s) to be used during the + specified timeWindow. + The attribute nTNEntityConfigList specifies configuration updates applied + to MOI(s) during the specified timeWindow."; + leaf timeWindow { uses types3gpp:TimeWindowGrp; config true; @@ -285,16 +285,16 @@ module _3gpp-nr-nrm-ntnfunction { type types3gpp:DistinguishedName; min-elements 0; description "It contains a list of NTN related MOIs. - allowedValues: DN of of the following MOIs: - EP_NgC, NRCellCU, NRCellDU, NRSectorCarrier, - SectorEquipmentFunction, NRCellRelation."; + allowedValues: DN of of the following MOIs: + EP_NgC, NRCellCU, NRCellDU, NRSectorCarrier, + SectorEquipmentFunction, NRCellRelation."; } leaf-list nTNEntityConfigRefList { uses NTNEntityConfigGrp; min-elements 0; description "It contains a list of configuration - updates to be applied to specified NTN entities."; + updates to be applied to specified NTN entities."; } } -- GitLab From de7d9567d82f67783660fb7af590f2bfadd455da Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 7 Feb 2025 16:48:00 +0000 Subject: [PATCH 21/40] Update _3gpp-nr-nrm-ntnfunction.yang --- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index cc14c83cd..0767395f8 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -276,7 +276,7 @@ module _3gpp-nr-nrm-ntnfunction { to MOI(s) during the specified timeWindow."; leaf timeWindow { - uses types3gpp:TimeWindowGrp; + type types3gpp:TimeWindowGrp; config true; description "It defines the time window."; } @@ -291,7 +291,7 @@ module _3gpp-nr-nrm-ntnfunction { } leaf-list nTNEntityConfigRefList { - uses NTNEntityConfigGrp; + type NTNEntityConfigGrp; min-elements 0; description "It contains a list of configuration updates to be applied to specified NTN entities."; -- GitLab From 2ce21929051e34d94c4bab789e40d035ee4374a0 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 7 Feb 2025 17:07:29 +0000 Subject: [PATCH 22/40] Update _3gpp-nr-nrm-ntnfunction.yang --- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index 0767395f8..7d2aa59ca 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -255,7 +255,7 @@ module _3gpp-nr-nrm-ntnfunction { SectorEquipmentFunction, NRCellRelation."; } - list nTNEntityConfigRefList { + leaf-list nTNEntityConfigRefList { key name; config true; uses types3gpp:nameValuePair; @@ -275,14 +275,16 @@ module _3gpp-nr-nrm-ntnfunction { The attribute nTNEntityConfigList specifies configuration updates applied to MOI(s) during the specified timeWindow."; - leaf timeWindow { - type types3gpp:TimeWindowGrp; + leaf-list timeWindow { + uses types3gpp:TimeWindowGrp; + min-elements 1; + max-elements 1; config true; description "It defines the time window."; } leaf-list nTNEntityRefList { - type types3gpp:DistinguishedName; + uses types3gpp:DistinguishedName; min-elements 0; description "It contains a list of NTN related MOIs. allowedValues: DN of of the following MOIs: -- GitLab From d51afb335692b23d4d4a90a050affc3576911a92 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 7 Feb 2025 17:13:36 +0000 Subject: [PATCH 23/40] Update _3gpp-nr-nrm-ntnfunction.yang --- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index 7d2aa59ca..de7f3a491 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -256,8 +256,6 @@ module _3gpp-nr-nrm-ntnfunction { } leaf-list nTNEntityConfigRefList { - key name; - config true; uses types3gpp:nameValuePair; description "Specifies the list of configuration parameters and values. The content of the attribute is a list of attributeName- attributeValue @@ -293,7 +291,7 @@ module _3gpp-nr-nrm-ntnfunction { } leaf-list nTNEntityConfigRefList { - type NTNEntityConfigGrp; + uses NTNEntityConfigGrp; min-elements 0; description "It contains a list of configuration updates to be applied to specified NTN entities."; -- GitLab From eaafe20e8e7d6cb342b576d16d1f6677f892d3bd Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 7 Feb 2025 17:22:10 +0000 Subject: [PATCH 24/40] Update _3gpp-nr-nrm-ntnfunction.yang --- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index de7f3a491..49c913b0e 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -255,8 +255,9 @@ module _3gpp-nr-nrm-ntnfunction { SectorEquipmentFunction, NRCellRelation."; } - leaf-list nTNEntityConfigRefList { + list nTNEntityConfigRefList { uses types3gpp:nameValuePair; + key "name"; description "Specifies the list of configuration parameters and values. The content of the attribute is a list of attributeName- attributeValue pairs. AttributeValues may be complex types."; @@ -273,15 +274,13 @@ module _3gpp-nr-nrm-ntnfunction { The attribute nTNEntityConfigList specifies configuration updates applied to MOI(s) during the specified timeWindow."; - leaf-list timeWindow { - uses types3gpp:TimeWindowGrp; - min-elements 1; - max-elements 1; + leaf timeWindow { + type types3gpp:TimeWindowGrp; config true; description "It defines the time window."; } - leaf-list nTNEntityRefList { + list nTNEntityRefList { uses types3gpp:DistinguishedName; min-elements 0; description "It contains a list of NTN related MOIs. -- GitLab From d82097b38afc5c51247b16470e60c05e3e879e5b Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 7 Feb 2025 17:27:58 +0000 Subject: [PATCH 25/40] Update _3gpp-nr-nrm-ntnfunction.yang --- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index 49c913b0e..d3512158e 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -274,13 +274,18 @@ module _3gpp-nr-nrm-ntnfunction { The attribute nTNEntityConfigList specifies configuration updates applied to MOI(s) during the specified timeWindow."; - leaf timeWindow { - type types3gpp:TimeWindowGrp; - config true; + list timeWindow { + key idx; + leaf idx { type uint32 ; } + min-elements 1; + max-elements 1; + uses types3gpp:TimeWindowGrp; description "It defines the time window."; } list nTNEntityRefList { + key idx; + leaf idx { type uint32 ; } uses types3gpp:DistinguishedName; min-elements 0; description "It contains a list of NTN related MOIs. @@ -289,7 +294,9 @@ module _3gpp-nr-nrm-ntnfunction { SectorEquipmentFunction, NRCellRelation."; } - leaf-list nTNEntityConfigRefList { + list nTNEntityConfigRefList { + key idx; + leaf idx { type uint32 ; } uses NTNEntityConfigGrp; min-elements 0; description "It contains a list of configuration -- GitLab From 6ea821de57aa88fdc3405e71f7dbfc2825d45952 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 7 Feb 2025 17:37:28 +0000 Subject: [PATCH 26/40] Update _3gpp-nr-nrm-ntnfunction.yang --- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index d3512158e..ea4f00087 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -283,9 +283,7 @@ module _3gpp-nr-nrm-ntnfunction { description "It defines the time window."; } - list nTNEntityRefList { - key idx; - leaf idx { type uint32 ; } + leaf-list nTNEntityRefList { uses types3gpp:DistinguishedName; min-elements 0; description "It contains a list of NTN related MOIs. @@ -294,7 +292,7 @@ module _3gpp-nr-nrm-ntnfunction { SectorEquipmentFunction, NRCellRelation."; } - list nTNEntityConfigRefList { + list nTNEntityConfigRefList { key idx; leaf idx { type uint32 ; } uses NTNEntityConfigGrp; -- GitLab From 232ae1d960aa0944525985c7e68c731e49565f44 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 7 Feb 2025 17:39:29 +0000 Subject: [PATCH 27/40] Update _3gpp-nr-nrm-ntnfunction.yang --- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index ea4f00087..7fc86ea92 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -284,7 +284,7 @@ module _3gpp-nr-nrm-ntnfunction { } leaf-list nTNEntityRefList { - uses types3gpp:DistinguishedName; + type types3gpp:DistinguishedName; min-elements 0; description "It contains a list of NTN related MOIs. allowedValues: DN of of the following MOIs: -- GitLab From 01d54d02c07c8911dfcd4122fffb49394dfe2565 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 7 Feb 2025 17:45:02 +0000 Subject: [PATCH 28/40] Update _3gpp-nr-nrm-ntnfunction.yang --- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index 7fc86ea92..534b8477d 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -274,12 +274,9 @@ module _3gpp-nr-nrm-ntnfunction { The attribute nTNEntityConfigList specifies configuration updates applied to MOI(s) during the specified timeWindow."; - list timeWindow { - key idx; - leaf idx { type uint32 ; } - min-elements 1; - max-elements 1; - uses types3gpp:TimeWindowGrp; + leaf timeWindow { + type types3gpp:TimeWindowGrp; + mandatory true; description "It defines the time window."; } -- GitLab From c07d00beca546cc008dd776a0e5f0c6d6b0edee4 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 7 Feb 2025 17:47:35 +0000 Subject: [PATCH 29/40] Update _3gpp-nr-nrm-ntnfunction.yang --- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index 534b8477d..7fc86ea92 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -274,9 +274,12 @@ module _3gpp-nr-nrm-ntnfunction { The attribute nTNEntityConfigList specifies configuration updates applied to MOI(s) during the specified timeWindow."; - leaf timeWindow { - type types3gpp:TimeWindowGrp; - mandatory true; + list timeWindow { + key idx; + leaf idx { type uint32 ; } + min-elements 1; + max-elements 1; + uses types3gpp:TimeWindowGrp; description "It defines the time window."; } -- GitLab From c0874f9ddb9b63d9d2bdeb739d035fcda7c9e0db Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 14 Feb 2025 12:34:17 +0000 Subject: [PATCH 30/40] Update _3gpp-nr-nrm-ntnfunction.yang --- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index 7fc86ea92..e0f9d04df 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -19,7 +19,7 @@ module _3gpp-nr-nrm-ntnfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - revision 2025-01-29 { reference CR-1479 ; } + revision 2025-02-13 { reference CR-1479 ; } revision 2024-05-24 { reference CR-1273 ; } @@ -265,8 +265,8 @@ module _3gpp-nr-nrm-ntnfunction { } grouping NTNTimeBasedConfigGrp { - description "This IOC represents a configuration to be applied during - a specified time window. + description "Define configuration to be applied during a specified time + window. The attribute timeWindow specifies the time window during which the specified configuration is applied. The attribute nTNEntityRefList specifies MOI(s) to be used during the @@ -352,6 +352,15 @@ module _3gpp-nr-nrm-ntnfunction { uses EphemerisInfoSetGrp; } } + + list NTNTimeBasedConfig { + description "This IOC represents the NTN time-based configuration."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses NTNTimeBasedConfigGrp; + } + } } } -- GitLab From b7525718099364db36c75a842030e578ed74ce2d Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 17 Feb 2025 10:17:21 +0000 Subject: [PATCH 31/40] Update _3gpp-nr-nrm-ntnfunction.yang --- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index e0f9d04df..de9c99cf1 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -255,7 +255,7 @@ module _3gpp-nr-nrm-ntnfunction { SectorEquipmentFunction, NRCellRelation."; } - list nTNEntityConfigRefList { + list nTNConfigList { uses types3gpp:nameValuePair; key "name"; description "Specifies the list of configuration parameters and values. @@ -292,7 +292,7 @@ module _3gpp-nr-nrm-ntnfunction { SectorEquipmentFunction, NRCellRelation."; } - list nTNEntityConfigRefList { + list nTNEntityConfigList { key idx; leaf idx { type uint32 ; } uses NTNEntityConfigGrp; -- GitLab From d67d55fd897e8efbb3ec67cb6b81b148b04de95d Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 17 Feb 2025 15:32:38 +0000 Subject: [PATCH 32/40] Update _3gpp-nr-nrm-ntnfunction.yang --- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index de9c99cf1..20dd62cf4 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -19,7 +19,7 @@ module _3gpp-nr-nrm-ntnfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; - revision 2025-02-13 { reference CR-1479 ; } + revision 2025-02-17 { reference CR-1479 ; } revision 2024-05-24 { reference CR-1273 ; } @@ -245,7 +245,10 @@ module _3gpp-nr-nrm-ntnfunction { } grouping NTNEntityConfigGrp { - description ""; + description "The attribute nTNConfEntity specifies an NTN related MOI. + The attribute nTNConfList optionally specifies configuration + updates to be applied to the nTNConfEntity. If no updates are provided + the value of nTNConfEntity is used without modification."; leaf nTNConfEntity { type types3gpp:DistinguishedName; @@ -269,10 +272,8 @@ module _3gpp-nr-nrm-ntnfunction { window. The attribute timeWindow specifies the time window during which the specified configuration is applied. - The attribute nTNEntityRefList specifies MOI(s) to be used during the - specified timeWindow. The attribute nTNEntityConfigList specifies configuration updates applied - to MOI(s) during the specified timeWindow."; + during the specified timeWindow."; list timeWindow { key idx; @@ -283,15 +284,6 @@ module _3gpp-nr-nrm-ntnfunction { description "It defines the time window."; } - leaf-list nTNEntityRefList { - type types3gpp:DistinguishedName; - min-elements 0; - description "It contains a list of NTN related MOIs. - allowedValues: DN of of the following MOIs: - EP_NgC, NRCellCU, NRCellDU, NRSectorCarrier, - SectorEquipmentFunction, NRCellRelation."; - } - list nTNEntityConfigList { key idx; leaf idx { type uint32 ; } @@ -354,7 +346,8 @@ module _3gpp-nr-nrm-ntnfunction { } list NTNTimeBasedConfig { - description "This IOC represents the NTN time-based configuration."; + description "This IOC represents the NTN time-based configuration. + "; key id; uses top3gpp:Top_Grp; container attributes { -- GitLab From 4d0b9d471043db467ef687f311af554b22784e80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Mon, 3 Feb 2025 08:21:16 +0000 Subject: [PATCH 33/40] Update _3gpp-common-managementdatacollection.yang --- yang-models/_3gpp-common-managementdatacollection.yang | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-common-managementdatacollection.yang b/yang-models/_3gpp-common-managementdatacollection.yang index 2a6ffea33..d7f49897f 100644 --- a/yang-models/_3gpp-common-managementdatacollection.yang +++ b/yang-models/_3gpp-common-managementdatacollection.yang @@ -12,7 +12,7 @@ module _3gpp-common-managementdatacollection { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Handling management data collection - 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) @@ -24,6 +24,7 @@ module _3gpp-common-managementdatacollection { Integration Reference Point (IRP); Information Service (IS)"; + revision 2025-02-07 { reference CR-XXXX; } revision 2024-04-12 { reference CR-0346; } revision 2023-11-18 { reference CR-0299 ; } revision 2023-11-06 { reference "CR-0305"; } @@ -224,7 +225,7 @@ module _3gpp-common-managementdatacollection { KPI definitions template as the component designated with a). For trace metrics (including trace messages, MDT measurements - (Immediate MDT, Logged MDT, Logged MBSFN MDT), RLF and RCEF + (Immediate MDT, Logged MDT, Logged MBSFN MDT), RRC, RLF and RCEF reports) defined in TS 32.422, the name (metric identifier) is defined in clause 10 of TS 32.422. @@ -288,7 +289,7 @@ module _3gpp-common-managementdatacollection { description "This IOC represents a management data collection request job. The requested data could be of kind Trace, MDT (Minimization of Drive Test), RLF (Radio Link Failure) report, RCEF (RRC Connection - Establishment Failure) report, PM (performance measurements), KPI + Establishment Failure) report, RRC report, PM (performance measurements), KPI (end-to-end key performance indicators) or a combination of these. The attribute 'managementData' defines the management data which shall -- GitLab From b2a08186458b842bae6c0554ef118c9f245b057f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 5 Feb 2025 08:00:22 +0000 Subject: [PATCH 34/40] Update _3gpp-common-managementdatacollection.yang --- yang-models/_3gpp-common-managementdatacollection.yang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-managementdatacollection.yang b/yang-models/_3gpp-common-managementdatacollection.yang index d7f49897f..bb9f3e9c1 100644 --- a/yang-models/_3gpp-common-managementdatacollection.yang +++ b/yang-models/_3gpp-common-managementdatacollection.yang @@ -289,7 +289,8 @@ module _3gpp-common-managementdatacollection { description "This IOC represents a management data collection request job. The requested data could be of kind Trace, MDT (Minimization of Drive Test), RLF (Radio Link Failure) report, RCEF (RRC Connection - Establishment Failure) report, RRC report, PM (performance measurements), KPI + Establishment Failure) report, RRC report, + PM (performance measurements), KPI (end-to-end key performance indicators) or a combination of these. The attribute 'managementData' defines the management data which shall -- GitLab From 8ae3d45a8bbdad12170bcb5c8cd3119d2308cedd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Thu, 6 Feb 2025 10:06:41 +0000 Subject: [PATCH 35/40] Update _3gpp-common-managementdatacollection.yang --- yang-models/_3gpp-common-managementdatacollection.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-managementdatacollection.yang b/yang-models/_3gpp-common-managementdatacollection.yang index bb9f3e9c1..960eba475 100644 --- a/yang-models/_3gpp-common-managementdatacollection.yang +++ b/yang-models/_3gpp-common-managementdatacollection.yang @@ -24,7 +24,7 @@ module _3gpp-common-managementdatacollection { Integration Reference Point (IRP); Information Service (IS)"; - revision 2025-02-07 { reference CR-XXXX; } + revision 2025-02-07 { reference CR-0505; } revision 2024-04-12 { reference CR-0346; } revision 2023-11-18 { reference CR-0299 ; } revision 2023-11-06 { reference "CR-0305"; } -- GitLab From 8edfc3173588b1685144e0271f2ad816e8bc5b28 Mon Sep 17 00:00:00 2001 From: ligan Date: Wed, 5 Feb 2025 03:07:58 +0000 Subject: [PATCH 36/40] Update _3gpp-nr-nrm-gnbdufunction.yang --- yang-models/_3gpp-nr-nrm-gnbdufunction.yang | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang index ca3c6f768..8e0b34487 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-02-05 { reference CR-1441; } revision 2024-02-24 { reference CR-1218; } revision 2023-09-18 { reference CR-1043 ; } revision 2023-04-26 { reference CR-0916; } @@ -195,6 +196,14 @@ module _3gpp-nr-nrm-gnbdufunction { type types3gpp:DistinguishedName; description "DN of the Dynamic5QISet that the GNBDUFunction supports (is associated to)."; } + + leaf nRECMappingRuleRef { + type types3gpp:DistinguishedName; + description "DN of a NRECMappingRule. An empty value indicates the + NRECMappingRule contained by parent, e.g. ManagedElement or + SubNetwork, applies."; + } + } augment "/me3gpp:ManagedElement" { -- GitLab From a6d77d142c27c777f5680308d2157c26031e14a2 Mon Sep 17 00:00:00 2001 From: ligan Date: Thu, 6 Feb 2025 02:56:29 +0000 Subject: [PATCH 37/40] Update _3gpp-nr-nrm-gnbdufunction.yang --- yang-models/_3gpp-nr-nrm-gnbdufunction.yang | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang index 8e0b34487..5e70bfb2d 100755 --- a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang @@ -188,16 +188,17 @@ module _3gpp-nr-nrm-gnbdufunction { leaf configurable5QISetRef { type types3gpp:DistinguishedName; - description "DN of the Configurable5QISet that the GNBDUFunction supports (is associated - to)."; + description "DN of the Configurable5QISet that the GNBDUFunction supports + (is associated to)."; } leaf dynamic5QISetRef { type types3gpp:DistinguishedName; - description "DN of the Dynamic5QISet that the GNBDUFunction supports (is associated to)."; + description "DN of the Dynamic5QISet that the GNBDUFunction supports + (is associated to)."; } - leaf nRECMappingRuleRef { + leaf nRECMappingRuleRef { type types3gpp:DistinguishedName; description "DN of a NRECMappingRule. An empty value indicates the NRECMappingRule contained by parent, e.g. ManagedElement or -- GitLab From 5a3da3bcb3154bcd90bda8087264b248c149a08f Mon Sep 17 00:00:00 2001 From: ligan Date: Tue, 18 Feb 2025 08:31:49 +0000 Subject: [PATCH 38/40] Update _3gpp-nr-nrm-gnbdufunction.yang --- yang-models/_3gpp-nr-nrm-gnbdufunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang index 5e70bfb2d..4932b44d8 100755 --- a/yang-models/_3gpp-nr-nrm-gnbdufunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbdufunction.yang @@ -14,7 +14,7 @@ module _3gpp-nr-nrm-gnbdufunction { contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "Defines the YANG mapping of the GNBDUFunction Information Object Class (IOC) that is part of the NR Network Resource Model (NRM). - Copyright 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)"; -- GitLab From c38224a16c019f95b8b5659bca7d096bd207f64e Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 27 Feb 2025 02:46:52 +0100 Subject: [PATCH 39/40] Locally rebased and merged https://forge.3gpp.org/rep/sa5/MnS/-/merge_requests/1575 --- yang-models/_3gpp-common-measurements.yang | 5 +++-- yang-models/_3gpp-common-yang-types.yang | 15 ++++++++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index 28c838a66..8dff9d525 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -44,7 +44,7 @@ module _3gpp-common-measurements { Measurements can be contained under ManagedElement, SubNetwork, or any list representing a class inheriting from Subnetwork or ManagedFunction. Note: KPIs will only be supported under SubNetwork - Copyright 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) @@ -56,6 +56,7 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; + revision 2025-01-29 { reference CR-0512; } revision 2024-11-01 { reference CR-0488; } revision 2024-05-06 { reference CR-0359; } revision 2024-02-24 { reference CR-0346; } @@ -251,7 +252,7 @@ module _3gpp-common-measurements { } grouping PerfMetricJobGrp { - description "Represents the attributtes of the IOC PerfMetricJob"; + description "Represents the attributes of the IOC PerfMetricJob"; leaf administrativeState { default UNLOCKED; diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 1cc7338f2..7590af02d 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 2025-02-19 { reference CR-0512; } revision 2025-02-07 { reference CR-0492; } revision 2024-11-25 { reference CR-1442; } revision 2024-11-25 { reference CR-1412; } @@ -1117,11 +1118,15 @@ module _3gpp-common-yang-types { notification subscription). When the related 'PerfMetricJob' is deleted, the 'NtfSubscriptionControl' instance created due to the request for implicit subscription shall be deleted as well. - - - When only the fileReportingPeriod and fileLocation attributes are - present, the MnS producer shall store the files on a MnS consumer, that - can be any entity such as a file server, at the location specified by - fileLocation. No notification is emitted by the MnS producer. + - When only the 'fileReportingPeriod' and 'fileLocation' attributes + are present (CHOICE_3), the MnS producer shall store the files at the + location specified by 'fileLocation'. The file location may identify + any entity such as a file server or a MnS consumer. The identified + MnS consumer may or may not be identical to the MnS consumer creating + the 'PerfMetricJob'. As for CHOICE_1 the MnS producer may emit + 'notifyFileReady' and 'notifyFilePreparationError' notifications to + inform subscribers that a file has been made available at the location + specified by 'fileLocation'. - When only the streamTarget attribute is present, the MnS producer shall stream the data to the location specified by streamTarget. -- GitLab From d0596a8dcd9c1f3064782322620552e7f6bd8d74 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 27 Feb 2025 03:36:49 +0100 Subject: [PATCH 40/40] Locally rebased and merged https://forge.3gpp.org/rep/sa5/MnS/-/merge_requests/1551 --- ..._3gpp-common-managementdatacollection.yang | 9 ++------ yang-models/_3gpp-common-measurements.yang | 22 +++++-------------- yang-models/_3gpp-common-trace.yang | 10 +-------- 3 files changed, 8 insertions(+), 33 deletions(-) diff --git a/yang-models/_3gpp-common-managementdatacollection.yang b/yang-models/_3gpp-common-managementdatacollection.yang index 960eba475..68e8a3ad8 100644 --- a/yang-models/_3gpp-common-managementdatacollection.yang +++ b/yang-models/_3gpp-common-managementdatacollection.yang @@ -24,7 +24,7 @@ module _3gpp-common-managementdatacollection { Integration Reference Point (IRP); Information Service (IS)"; - revision 2025-02-07 { reference CR-0505; } + revision 2025-02-07 { reference "CR-0461 CR-0505"; } revision 2024-04-12 { reference CR-0346; } revision 2023-11-18 { reference CR-0299 ; } revision 2023-11-06 { reference "CR-0305"; } @@ -214,12 +214,7 @@ module _3gpp-common-managementdatacollection { The metrics are identified with their names/identifiers. For performance measurements defined in TS 28.552 the name is - constructed as follows: - - 'family.measurementName.subcounter' for measurement types with - subcounters - - 'family.measurementName' for measurement types without - subcounters - - 'family' for measurement families + constructed as the bullet e) of the measurement definition. For KPIs defined in TS 28.554 the name is defined according to the KPI definitions template as the component designated with a). diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index 8dff9d525..02df31bf7 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -56,6 +56,7 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; + revision 2025-02-07 { reference CR-0461; } revision 2025-01-29 { reference CR-0512; } revision 2024-11-01 { reference CR-0488; } revision 2024-05-06 { reference CR-0359; } @@ -94,13 +95,8 @@ module _3gpp-common-measurements { by other SDOs, or be vendor specific. Performance metrics are identified with their names. - For measurements defined in TS 28.552 the name is constructed as follows: - - 'family.measurementName.subcounter' for measurement types with - subcounters - - 'family.measurementName' for measurement types without subcounters - `- 'family' for measurement families - For KPIs defined in TS 28.554 [28] the name is defined in the KPI - definitions template as the component designated with e). + For measurements defined in TS 28.552 the name is constructed as the + bullet e) of the measurement definition. A name can also identify a vendor specific performance metric or a group of vendor specific performance metrics."; @@ -209,11 +205,7 @@ module _3gpp-common-measurements { Measurements are identified by name. For measurements defined in TS 28.552 the name is constructed as - follows: - - 'family.measurementName.subcounter' for measurement types with - subcounters - - 'family.measurementName' for measurement types without subcounters - - 'family' for measurement families + the bullet e) of the measurement definition. For KPIs defined in TS 28.554 the name is defined in the KPI definitions template as the component designated with e). @@ -283,11 +275,7 @@ module _3gpp-common-measurements { identify a vendor specific group of performance metrics. For measurements defined in TS 28.552 the name is constructed as - follows: - - 'family.measurementName.subcounter' for measurement types with - subcounters - - 'family.measurementName' for measurement types without subcounters - - 'family' for measurement families + the bullet e) of the measurement definition. For KPIs defined in TS 28.554 the name is defined in the KPI definitions template as the component designated with e)."; diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 23152ebf5..a989450d9 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -27,6 +27,7 @@ module _3gpp-common-trace { Information Service (IS)" ; revision 2025-02-07 { reference "CR-0504"; } + revision 2025-02-05 { reference "CR-0461" ; } revision 2024-11-25 { reference CR-0492; } revision 2024-11-07 { reference "CR-0480"; } revision 2024-10-01 { reference "CR-0457"; } @@ -1613,15 +1614,6 @@ module _3gpp-common-trace { The list may include 5GC UE level measurements defined in TS 28.558, or vendor specific measurements. - For 5GC UE level measurements defined in TS 28.558, the name is - constructed as follows: - 'family.measurementName.subcounter' for measurement type with - specified subcounter - 'family.measurementName.ALL' for measurement type with all supported - subcounters - 'family.measurementName' for measurement type without subcounters - 'family' for measurement family, including all measurement types and - the associated subcounters under this family. For non-3GPP specified 5GC UE level measurements the name is defined elsewhere."; } -- GitLab