Commit 72311e22 authored by lengyelb's avatar lengyelb
Browse files

corrected operatorDU and EP_F1C/U containment except externals

parent 70855017

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

+30 −47
Original line number Diff line number Diff line
@@ -15,10 +15,11 @@ module _3gpp-nr-nrm-ep { 
  description "Defines the YANG mapping of the NR related endpoint

    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)";



  revision 2025-05-06 { reference "CR-1526 CR-1527" ; }  // common for R18, R19

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

  revision 2022-01-07 { reference CR-0643; }

  revision 2021-05-01 { reference CR-0490; }
@@ -46,17 +47,31 @@ module _3gpp-nr-nrm-ep { 
    uses eprp3gpp:EP_Common;

  }



  grouping EP_F1CGrp {

    description "Represents the EP_F1C IOC.";

  grouping EP_F1CSubtree {

    list EP_F1C {

      description "Represents the local end point of the control plane

        interface (F1-C) between the gNB-DU and gNB-CU or gNB-CU-CP.";

      reference "3GPP TS 28.541, 3GPP TS 38.470";

      key id;

      uses top3gpp:Top_Grp;

      container attributes {    

        uses eprp3gpp:EP_Common;

      }

    }

  }



  grouping EP_F1UGrp {

    description "Represents the EP_F1U IOC.";

  grouping EP_F1USubtree {

    list EP_F1U {

      description "Represents the local end point of the user plane

        interface (F1-U) between the gNB-DU and gNB-CU or gNB-CU-UP.";

      reference "3GPP TS 28.541, 3GPP TS 38.470";

      key id;

      uses top3gpp:Top_Grp;

      container attributes {    

        uses eprp3gpp:EP_Common;

      }

    }

  }



  grouping EP_XnCGrp {

    description "Represents the EP_XnC IOC.";
@@ -114,16 +129,7 @@ module _3gpp-nr-nrm-ep { 
      }

    }



    list EP_F1C {

      description "Represents the local end point of the control plane

        interface (F1-C) between the gNB-DU and gNB-CU or gNB-CU-CP.";

      reference "3GPP TS 28.541, 3GPP TS 38.470";

      key id;

      uses top3gpp:Top_Grp;

      container attributes {    

        uses EP_F1CGrp;

      }

    }

    uses EP_F1CSubtree;



    list EP_NgC {

      description "Represents the local end point of the control plane
@@ -176,16 +182,7 @@ module _3gpp-nr-nrm-ep { 
      }

    }



    list EP_F1U {

      description "Represents the local end point of the user plane

        interface (F1-U) between the gNB-DU and gNB-CU or gNB-CU-UP.";

      reference "3GPP TS 28.541, 3GPP TS 38.470";

      key id;

      uses top3gpp:Top_Grp;

      container attributes {    

        uses EP_F1UGrp;

      }

    }

    uses EP_F1USubtree;



    list EP_NgU {

      description "Represents the local end point of the NG user plane
@@ -236,26 +233,12 @@ module _3gpp-nr-nrm-ep { 
  augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" {

    if-feature EPClassesUnderGNBDUFunction;



    list EP_F1C {

      description "Represents the local end point of the control plane

        interface (F1-C) between the DU and CU or CU-CP.";

      reference "3GPP TS 28.541, 3GPP TS 38.470";

      key id;

      uses top3gpp:Top_Grp;

      container attributes {    

        uses EP_F1CGrp;

    uses EP_F1CSubtree {

      refine EP_F1C {

        max-elements 1;

      }

    }



    list EP_F1U {

      description "Represents the local end point of the user plane

        interface (F1-U) between the DU and CU or CU-UP.";

      reference "3GPP TS 28.541, 3GPP TS 38.470";

      key id;

      uses top3gpp:Top_Grp;

      container attributes {    

        uses EP_F1UGrp;

      }

    }

    uses EP_F1USubtree;

  }

}
 
 No newline at end of file

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

+11 −2
Original line number Diff line number Diff line
@@ -7,15 +7,17 @@ module _3gpp-nr-nrm-operatordu { 
  import _3gpp-common-managed-element { prefix me3gpp; }

  import _3gpp-nr-nrm-gnbdufunction {prefix gnbdu3gpp; }

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

  import _3gpp-nr-nrm-ep { prefix ep3gpp; }

  

  organization "3GPP SA5";

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

  description "Defines the YANG mapping of the OperatorDU Information Object

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

    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-05-06 { reference "CR-1526 CR-1527" ; }  // common for R18, R19

  revision 2024-02-24 { reference CR-1218; } 

  revision 2023-11-14 { reference "CR1136"; }

  revision 2023-09-30 { reference "CR1048"; }
@@ -76,7 +78,14 @@ module _3gpp-nr-nrm-operatordu { 
      container attributes {

        uses OperatorDUGrp;

      }

      uses gnbdu3gpp:GNBDUFunctionGrp;

      

      uses ep3gpp:EP_F1CSubtree {

        refine EP_F1C {

          max-elements 1;

        }

      }

        

      uses ep3gpp:EP_F1USubtree;

    }

  }

}
 
 No newline at end of file