From 3b31d844f123653611841f5187878b6ec2f7c34d Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 6 Feb 2025 01:11:07 +0100 Subject: [PATCH 1/7] update extensions --- yang-models/_3gpp-common-yang-extensions.yang | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-common-yang-extensions.yang b/yang-models/_3gpp-common-yang-extensions.yang index dc9c8e5b5..0b1c1ee27 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,6 +46,7 @@ module _3gpp-common-yang-extensions { Solution Set (SS) definitions 3GPP TS 28.623"; + 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"; } @@ -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 b36b45c95fcad4c58b719495368aebbaec7c9b73 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Fri, 7 Feb 2025 17:00:05 +0100 Subject: [PATCH 2/7] CRno correction --- 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 0b1c1ee27..22d1090a8 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-01-12 { reference "CR-0507, 0492" ; } + revision 2025-02-06{ reference "CR-0507, 0507" ; } 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 7db76ab057f09659ffc1a9ed26f1010b40c9f374 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Mon, 10 Feb 2025 12:08:10 +0100 Subject: [PATCH 3/7] NPNId correction --- yang-models/_3gpp-common-trace.yang | 31 ++++++++++++++++++----------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 0a1201721..9589cb38f 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -164,18 +164,25 @@ module _3gpp-common-trace { 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; } + choice npnidChoice { + leaf-list cAGIdList { + type string; + max-elements 256; + description "It identifies a CAG list containing up to 256 + 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 7ae279665312277fdaa5e871860bf9eced34facb Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 19 Feb 2025 14:44:09 +0100 Subject: [PATCH 4/7] update GeographicalCoordinates --- yang-models/_3gpp-common-yang-types.yang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 3c8b9c7a4..a0072d612 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -12,10 +12,11 @@ module _3gpp-common-yang-types { description "The model defines a YANG mapping of the top level information classes used for management of 5G networks and network slicing. - Copyright 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 2025-02-06 { reference CR-0507; } revision 2024-05-18 { reference CR-0359; } revision 2024-04-12 { reference CR-0346; } revision 2023-11-06 { reference CR-0305; } -- GitLab From 6d5d93bb4a9a0c8de7571ad0230e082e92021db9 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 19 Feb 2025 14:47:36 +0100 Subject: [PATCH 5/7] update GeographicalCoordinates 2 --- yang-models/_3gpp-common-yang-types.yang | 1 - 1 file changed, 1 deletion(-) diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index a0072d612..747dbbaae 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -328,7 +328,6 @@ module _3gpp-common-yang-types { leaf altitude { type Altitude; } - } typedef OnOff { -- GitLab From d12fc12e0250ad0092b119c38fbab4213e269c72 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 19 Feb 2025 14:52:52 +0100 Subject: [PATCH 6/7] update GeographicalCoordinates 3 --- yang-models/_3gpp-common-yang-types.yang | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 747dbbaae..d7211b374 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -324,10 +324,10 @@ module _3gpp-common-yang-types { type Longitude; mandatory true; } - - leaf altitude { - type Altitude; - } + + leaf altitude { + type Altitude; + } } typedef OnOff { -- GitLab From 21efaab861b7e1bf8034b43982196ffc7bcabba2 Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 19 Feb 2025 15:21:42 +0100 Subject: [PATCH 7/7] update GeographicalCoordinates remove altitude GeocoordinateGrp add alititude 4 --- yang-models/_3gpp-common-yang-types.yang | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index d7211b374..4f9a1d3a4 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -313,7 +313,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; @@ -324,10 +324,6 @@ module _3gpp-common-yang-types { type Longitude; mandatory true; } - - leaf altitude { - type Altitude; - } } typedef OnOff { @@ -644,6 +640,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