From 07028b206fc770b376f162aeb8fc8c3a53efe567 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 7 Feb 2025 16:24:40 +0000 Subject: [PATCH 01/16] 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 02/16] 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 03/16] 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 04/16] 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 05/16] 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 06/16] 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 07/16] 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 08/16] 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 09/16] 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 10/16] 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 11/16] 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 12/16] 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 13/16] 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 14/16] 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 15/16] 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 16/16] 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