Commit c0916860 authored by lengyelb's avatar lengyelb
Browse files

Locally rebase and merge !1687

parent 0b4c8f92

yang-models/_3gpp-5gc-nrm-amffunction.yang

+16 −3
Original line number Diff line number Diff line
@@ -10,16 +10,17 @@ module _3gpp-5gc-nrm-amffunction { 
  import ietf-inet-types { prefix inet; }

  import ietf-yang-types { prefix yang; }

  import _3gpp-common-top { prefix top3gpp; }

  import _3gpp-nr-nrm-ntnfunction { prefix ntn3gpp; }

 



  organization "3gpp SA5";

  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";

  description "AMFFunction derived from basic ManagedFunction.

    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 

    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 

    TTA, TTC). All rights reserved.";

  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";



  revision 2025-03-25 { reference CR-1489 ; } 

  revision 2025-03-25 { reference "CR-1489 CR-1512" ; } 

  revision 2024-11-01 { reference CR-1405; }

  revision 2024-10-06 { reference CR-1389; }

  revision 2024-04-04 { reference CR-1139; }
@@ -455,7 +456,10 @@ module _3gpp-5gc-nrm-amffunction { 
  }

  

  grouping AMFFunctionGrp {

    description "Represents the AMFFunction IOC";

    description "Represents the AMFFunction IOC.

    This IOC contains instances of NTNTimeBasedConfig to support 

    time-based configuration of the following NTN related entities:  

    AMFFunction and EP_N2.";

    uses mf3gpp:ManagedFunctionGrp;



    list pLMNInfoList {
@@ -581,6 +585,15 @@ module _3gpp-5gc-nrm-amffunction { 
      type types3gpp:DistinguishedName;

      description "This is the DN of AMFSet";

    }



    list NTNTimeBasedConfig {

        description "This is the NTN time-based configuration.";

        key id;

        uses top3gpp:Top_Grp;

        container attributes {

          uses ntn3gpp:NTNTimeBasedConfigGrp;

        }

      }

  }

  

  augment "/me3gpp:ManagedElement" {

yang-models/_3gpp-nr-nrm-ntnfunction.yang

+4 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ module _3gpp-nr-nrm-ntnfunction { 
    TTA, TTC). All rights reserved.";

  reference "3GPP TS 28.541";

  

  revision 2025-03-27 { reference CR-1512; }

  revision 2025-02-17 { reference CR-1479 ; }

  revision 2024-05-24 { reference CR-1273 ; }
@@ -326,7 +327,9 @@ module _3gpp-nr-nrm-ntnfunction { 
        NR access.  This IOC contains instances of NTNTimeBasedConfig to support

        time-based configuration of the following NTN related entities:  

        EP_NgC, NRCellCU, NRCellDU, NRSectorCarrier, SectorEquipmentFunction, 

        and NRCellRelation.";

        and NRCellRelation.  The IP Configuration of the feeder links may be 

        configured via IP Autoconfiguration services [x] and/or configured via 

        instances of NTNTimeBasedConfig in anticipation of feeder link switchovers.";

      key id;

      max-elements 1;

      uses top3gpp:Top_Grp;