From 4b35787c062299e85d3c81b429379e8b22b9285f Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 28 Mar 2025 13:34:40 +0000 Subject: [PATCH 1/6] Update _3gpp-nr-nrm-ntnfunction.yang --- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index 20dd62cf4..56154786d 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -326,7 +326,9 @@ module _3gpp-nr-nrm-ntnfunction { NR access. This IOC contains instances of NTNTimeBasedConfig to support time-based configuration of the following NTN related entities: EP_NgC, NRCellCU, NRCellDU, NRSectorCarrier, SectorEquipmentFunction, - and NRCellRelation."; + and NRCellRelation. The IP Configuration of the feeder links may be + configured via IP Autoconfiguration services [x] and/or configured via + instances of NTNTimeBasedConfig in anticipation of feeder link switchovers."; key id; max-elements 1; uses top3gpp:Top_Grp; -- GitLab From babe2d203763204351acb50d070b2dc7e708093a Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 28 Mar 2025 13:36:42 +0000 Subject: [PATCH 2/6] Update _3gpp-nr-nrm-ntnfunction.yang --- yang-models/_3gpp-nr-nrm-ntnfunction.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang index 56154786d..43e2a86eb 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -19,6 +19,7 @@ module _3gpp-nr-nrm-ntnfunction { TTA, TTC). All rights reserved."; reference "3GPP TS 28.541"; + revision 2025-03-27 { reference CR-1512; } revision 2025-02-17 { reference CR-1479 ; } revision 2024-05-24 { reference CR-1273 ; } -- GitLab From ed8338afc67657d7cdbef100e3c4d0b39291d6c6 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 28 Mar 2025 13:52:22 +0000 Subject: [PATCH 3/6] Update _3gpp-5gc-nrm-amffunction.yang --- yang-models/_3gpp-5gc-nrm-amffunction.yang | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index cf6b290f2..d397aa2f8 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -11,14 +11,17 @@ module _3gpp-5gc-nrm-amffunction { import ietf-yang-types { prefix yang; } import _3gpp-common-top { prefix top3gpp; } import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; } + import _3gpp-nr-nrm-ntnfunction { prefix ntn3gpp; } + organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; description "AMFFunction derived from basic ManagedFunction. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2025-03-27 { reference CR-1512; } revision 2024-11-01 { reference CR-1405; } revision 2024-10-06 { reference CR-1389; } revision 2024-04-04 { reference CR-1139; } @@ -453,8 +456,12 @@ module _3gpp-5gc-nrm-amffunction { } } + grouping AMFFunctionGrp { - description "Represents the AMFFunction IOC"; + description "Represents the AMFFunction IOC. + This IOC contains instances of NTNTimeBasedConfig to support + time-based configuration of the following NTN related entities: + AMFFunction, SMFFunction, UPFFunction, LMFFunction and EP_N2."; uses mf3gpp:ManagedFunctionGrp; list pLMNInfoList { @@ -580,6 +587,15 @@ module _3gpp-5gc-nrm-amffunction { type types3gpp:DistinguishedName; description "This is the DN of AMFSet"; } + + list NTNTimeBasedConfig { + description "This is the NTN time-based configuration."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses ntn3gpp:NTNTimeBasedConfigGrp; + } + } } augment "/me3gpp:ManagedElement" { -- GitLab From 68d4acfad1b136ba284fdda29c5e90ada9175d6f Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 28 Mar 2025 13:53:12 +0000 Subject: [PATCH 4/6] 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 43e2a86eb..a64a7e76b 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -349,7 +349,7 @@ module _3gpp-nr-nrm-ntnfunction { } list NTNTimeBasedConfig { - description "This IOC represents the NTN time-based configuration. + description "This represents the NTN time-based configuration. "; key id; uses top3gpp:Top_Grp; -- GitLab From 15555eb48c588c715350b422ae11dbad3d1f937a Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 28 Mar 2025 14:12:28 +0000 Subject: [PATCH 5/6] 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 a64a7e76b..43e2a86eb 100644 --- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang +++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang @@ -349,7 +349,7 @@ module _3gpp-nr-nrm-ntnfunction { } list NTNTimeBasedConfig { - description "This represents the NTN time-based configuration. + description "This IOC represents the NTN time-based configuration. "; key id; uses top3gpp:Top_Grp; -- GitLab From 99296fd14e5b075413f9261ca9c747ee2eba3f0b Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 10 Apr 2025 13:18:53 +0000 Subject: [PATCH 6/6] Update _3gpp-5gc-nrm-amffunction.yang --- yang-models/_3gpp-5gc-nrm-amffunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang index d397aa2f8..1fb341e17 100755 --- a/yang-models/_3gpp-5gc-nrm-amffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang @@ -461,7 +461,7 @@ module _3gpp-5gc-nrm-amffunction { description "Represents the AMFFunction IOC. This IOC contains instances of NTNTimeBasedConfig to support time-based configuration of the following NTN related entities: - AMFFunction, SMFFunction, UPFFunction, LMFFunction and EP_N2."; + AMFFunction and EP_N2."; uses mf3gpp:ManagedFunctionGrp; list pLMNInfoList { -- GitLab