Commit aa48cd86 authored by lengyelb's avatar lengyelb
Browse files

Corrected containments

parent 8fbff1a5

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

+14 −41
Original line number Diff line number Diff line
@@ -3,61 +3,34 @@ module _3gpp-nr-nrm-eutranetwork { 
  namespace "urn:3gpp:sa5:_3gpp-nr-nrm-eutranetwork";

  prefix "eutranet3gpp";



  import _3gpp-common-subnetwork { prefix subnet3gpp; }

  import _3gpp-common-managed-element { prefix me3gpp; }

  import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; }

  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 EUtraNetwork Information Object

    Class (IOC) that is part of the NR Network Resource Model (NRM).

    Copyright 2023, 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-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19

  revision 2023-09-18 { reference CR-1043 ; } 

  revision 2019-06-17 {

    description "Initial revision";

  }



  feature ExternalsUnderEUtraNetwork {

    description "Classes representing external entities like EUtranFrequency, 

      ExternalENBFunction are contained under a EUtraNetwork list/class.";

  }

  revision 2019-06-17 {reference "Initial revision"; }



  grouping EUtraNetworkGrp {

    description "Represents the EUtraNetwork IOC.";

    reference "3GPP TS 28.541";

    uses subnet3gpp:SubNetworkGrp;

    description "Represents the EUtraNetwork IOC.

      Contains no additiona attributes.";

  }



  augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction {  

    list EUtraNetwork {

      description "A subnetwork containing gNB external E-UTRAN entities.";

      reference "3GPP TS 28.541";

      key id;

      uses top3gpp:Top_Grp;

      container attributes {

        uses EUtraNetworkGrp;

      leaf-list parents {

        description "Reference to all containg EUtraNetwork instances 

          in strict order from the root EUtraNetwork down to the immediate 

          parent EUtraNetwork.

          If EUtraNetworks form a containment hierarchy this is 

          modeled using references between the child EUtraNetwork and the parent 

          EUtraNetworks. 

          This reference MUST NOT be present for the top level EUtraNetwork and 

          MUST be present for other EUtraNetworks.";

        type leafref {

          path "../../../EUtraNetwork/id";  

        } 

      }

      

      leaf-list containedChildren{

        description "Reference to all directly contained EUtraNetwork instances.

          If EUtraNetworks form a containment hierarchy this is 

          modeled using references between the child EUtraNetwork and the parent 

          EUtraNetwork.";

        type leafref {

          path "../../../EUtraNetwork/id";  

        } 

      }

    }

  }

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

+18 −10
Original line number Diff line number Diff line
@@ -3,29 +3,29 @@ module _3gpp-nr-nrm-eutranfrequency { 
  namespace "urn:3gpp:sa5:_3gpp-nr-nrm-eutranfrequency";

  prefix "eutraneteutranfreq3gpp";



  import _3gpp-common-managed-function { prefix mf3gpp; }

  import _3gpp-common-managed-element { prefix me3gpp; }

  import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; }

  import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; }

  import _3gpp-common-subnetwork { prefix subnet3gpp; }

  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 EUtranFrequency 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),

    3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)";



  revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19

  revision 2023-09-18 { reference CR-1043 ; } 

  revision 2019-10-28 { reference S5-193518 ; }

  revision 2019-06-17 {

    description "Initial revision";

  }

  revision 2019-06-17 { reference "Initial revision"; }



  grouping EUtranFrequencyGrp {

    description "Represents the EUtranFrequency IOC.";

    reference "3GPP TS 28.541";

    uses mf3gpp:ManagedFunctionGrp;



    leaf earfcnDL {

      description "Specifies the channel number for the central DL frequency.";
@@ -51,17 +51,25 @@ module _3gpp-nr-nrm-eutranfrequency { 
      container attributes {

        uses EUtranFrequencyGrp;

      }

      uses mf3gpp:ManagedFunctionContainedClasses;

    }

  } 

  

  feature ExternalENBFunctionUnderSubNetwork {

    description "The ExternalENBFunction shall be contained under SubNetwork";

  }

  

  augment "/subnet3gpp:SubNetwork" {

    if-feature subnet3gpp:ExternalsUnderSubNetwork ;

    if-feature ExternalENBFunctionUnderSubNetwork ;

    uses EUtranFrequencyWrapper ;

  }



  augment "/eutranet3gpp:EUtraNetwork" {

    if-feature eutranet3gpp:ExternalsUnderEUtraNetwork;

  feature ExternalENBFunctionUnderEUtraNetwork {

    description "The ExternalENBFunction shall be contained under EUtraNetwork";

  }

  

  augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" 

      + "eutranet3gpp:EUtraNetwork" {

    if-feature ExternalENBFunctionUnderEUtraNetwork;

    uses EUtranFrequencyWrapper ;

  }

}
 
 No newline at end of file

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

+4 −12
Original line number Diff line number Diff line
@@ -5,26 +5,24 @@ module _3gpp-nr-nrm-externalamffunction { 
    

  import _3gpp-common-managed-function { prefix mf3gpp; }

  import _3gpp-common-subnetwork { prefix subnet3gpp; }

  import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; }

  import _3gpp-common-top { prefix top3gpp; }

  import _3gpp-common-yang-types { prefix types3gpp; }



  organization "3GPP SA5";

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

  description "Defines the YANG mapping of the ExternalAMFFunction 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-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19

  revision 2023-09-18 { reference CR-1043 ; } 

  revision 2019-10-28 { reference S5-193518 ; }

  revision 2019-06-17 {

    description "Initial revision";

  }

  revision 2019-06-17 { reference "Initial revision"; }



  grouping ExternalAMFFunctionGrp {

    description "Represents the ExternalAMFFunction IOC.";

    reference "3GPP TS 28.541";

    uses mf3gpp:ManagedFunctionGrp;



    list pLMNIdList {
@@ -61,12 +59,6 @@ module _3gpp-nr-nrm-externalamffunction { 
  } 

  

  augment "/subnet3gpp:SubNetwork" {

    if-feature subnet3gpp:ExternalsUnderSubNetwork ;

    uses ExternalAMFFunctionWrapper;

  }



  augment "/nrnet3gpp:NRNetwork" {

    if-feature nrnet3gpp:ExternalsUnderNRNetwork;

    uses ExternalAMFFunctionWrapper;

  }

}
 
 No newline at end of file

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

+24 −8
Original line number Diff line number Diff line
@@ -4,24 +4,27 @@ module _3gpp-nr-nrm-externalenbfunction { 
  prefix "extenb3gpp";



  import _3gpp-common-managed-function { prefix mf3gpp; }

  import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; }

  import _3gpp-common-subnetwork { prefix subnet3gpp; }

  import _3gpp-common-managed-element { prefix me3gpp; }

  import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; }

  import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; }

  import _3gpp-nr-nrm-externaleutrancell { prefix exteutrancell3gpp; }

  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 ExternalENBFunction

    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),

    3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)";



  revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19

  revision 2023-09-18 { reference CR-1043 ; } 

  revision 2019-10-28 { reference S5-193518 ; }

  revision 2019-06-17 {

    description "Initial revision";

  }

  revision 2019-06-17 { reference "Initial revision"; }



  grouping ExternalENBFunctionGrp {

    description "Represets the ExternalENBFunction IOC.";
@@ -48,16 +51,29 @@ module _3gpp-nr-nrm-externalenbfunction { 
        uses ExternalENBFunctionGrp;

      }

      uses mf3gpp:ManagedFunctionContainedClasses;

      uses exteutrancell3gpp:ExternalEUtranCellFDDSubtree;

      uses exteutrancell3gpp:ExternalEUtranCellTDDSubtree;

    }

  } 

  

  feature ExternalENBFunctionUnderSubNetwork {

    description "The ExternalENBFunction shall be contained under

      SubNetwork";

  }

  

  augment "/subnet3gpp:SubNetwork" {

    if-feature subnet3gpp:ExternalsUnderSubNetwork ;

    if-feature ExternalENBFunctionUnderSubNetwork ;

    uses ExternalENBFunctionWrapper;

  }



  augment "/eutranet3gpp:EUtraNetwork" {

    if-feature eutranet3gpp:ExternalsUnderEUtraNetwork;

  feature ExternalENBFunctionUnderEUtraNetwork {

    description "The ExternalENBFunction shall be contained under

      EUtraNetwork";

  }

  

  augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/"

        + "eutranet3gpp:EUtraNetwork" {

    if-feature ExternalENBFunctionUnderEUtraNetwork;

    uses ExternalENBFunctionWrapper;

  }

}
 
 No newline at end of file

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

+6 −29
Original line number Diff line number Diff line
@@ -5,25 +5,22 @@ module _3gpp-nr-nrm-externaleutrancell { 


  import _3gpp-common-yang-types { prefix types3gpp; }

  import _3gpp-common-managed-function { prefix mf3gpp; }

  import _3gpp-common-subnetwork { prefix subnet3gpp; }

  import _3gpp-nr-nrm-eutranetwork { prefix eutranet3gpp; }

  import _3gpp-nr-nrm-externalenbfunction { prefix extenb3gpp; }

  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 ExternalEUtranCellFDD and

    ExternalEUtranCellTDD Information Object Classes (IOCs) that are 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),

    3GPP TS 28.658 (E-UTRAN) Network Resource Model (NRM)";



  revision 2025-04-25 { reference "CR-1526 CR-1527" ; } // common for r18, r19

  revision 2023-09-18 { reference CR-1043 ; } 

  revision 2019-10-28 { reference S5-193518 ; }

  revision 2019-06-17 {

    description "Initial revision";

  }

  revision 2019-06-17 { reference "Initial revision"; }



  grouping ExternalEUtranGenericCellGrp {

    description "Represents the ExternalEUtranGenericCell IOC.";
@@ -106,7 +103,7 @@ module _3gpp-nr-nrm-externaleutrancell { 
    }

  }



  grouping ExternalEUtranCellFDDWrapper {

  grouping ExternalEUtranCellFDDSubtree {

    list ExternalEUtranCellFDD {

      description "Represents the common properties of external E-UTRAN FDD

        cell provided by eNB or NG-RAN FDD cell provided by ng-eNB.";
@@ -120,7 +117,7 @@ module _3gpp-nr-nrm-externaleutrancell { 
    }

  }



  grouping ExternalEUtranCellTDDWrapper {

  grouping ExternalEUtranCellTDDSubtree {

    list ExternalEUtranCellTDD {

      description "Represents the common properties of external E-UTRAN cell

        TDD provided by eNB or NG-RAN TDD cell provided by ng-eNB.";
@@ -133,24 +130,4 @@ module _3gpp-nr-nrm-externaleutrancell { 
      uses mf3gpp:ManagedFunctionContainedClasses;

    }

  }



  augment "/subnet3gpp:SubNetwork/extenb3gpp:ExternalENBFunction" {

    if-feature subnet3gpp:ExternalsUnderSubNetwork;

    uses ExternalEUtranCellFDDWrapper;

  }



  augment "/eutranet3gpp:EUtraNetwork/extenb3gpp:ExternalENBFunction" {

    if-feature eutranet3gpp:ExternalsUnderEUtraNetwork;

    uses ExternalEUtranCellFDDWrapper;

  }

  

  augment "/subnet3gpp:SubNetwork/extenb3gpp:ExternalENBFunction" {

    if-feature subnet3gpp:ExternalsUnderSubNetwork;

    uses ExternalEUtranCellTDDWrapper;

  }



  augment "/eutranet3gpp:EUtraNetwork/extenb3gpp:ExternalENBFunction" {

    if-feature eutranet3gpp:ExternalsUnderEUtraNetwork;

    uses ExternalEUtranCellTDDWrapper;

  }

}
 
 No newline at end of file