Commit f45e138f authored by lengyelb's avatar lengyelb
Browse files

Merge branch '28541_CR_0753_Enhanced_QoS_Model' into 'Integration_Rel18_SA5_146_YANG' 

28541 cr 0753 enhanced qos model

See merge request sa5/MnS!452
parents 6fba0f17 356cb5bc

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

+10 −2
Original line number Diff line number Diff line
@@ -9,9 +9,17 @@ module _3gpp-5gc-nrm-configurable5qiset { 
  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";

  description "This IOC represents the configurable 5QIs, including 

    their QoS characteristics, that need to be pre-configured 

    (and configurable) to the 5G NFs.";

    (and configurable) to the 5G NFs.



    The 5QI set definition supports multiple deployment scenarios.  The sets can

    be name contained by SubNetwork ManagedElement, GNBDUFunction,

    GNBCUUPFunction and GNBCUCPFunction.  Sets are then referenced by attribute

    (configurable5QISetRef) in applicable MOIs.  For consistency it is 

    recommended that referenced 5QI sets be defined within the same subtree.";



  reference "3GPP TS 28.541";



  revision 2022-11-02 { reference "CR-0753" ; }

  revision 2022-07-28 { reference "CR-0770"; }

  revision 2022-04-29 { reference "CR-0729"; }

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

yang-models/_3gpp-common-managed-function.yang

+12 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ module _3gpp-common-managed-function { 
  import _3gpp-common-top { prefix top3gpp; }

  import _3gpp-common-measurements { prefix meas3gpp; }

  import _3gpp-common-trace { prefix trace3gpp; }

  import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; }

  

  organization "3GPP SA5";

  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -20,6 +21,7 @@ module _3gpp-common-managed-function { 
    

    3GPP TS 28.620 

    Umbrella Information Model (UIM)";

  revision 2022-11-02 { reference "CR-0753"; }

  revision 2022-01-07 { reference "CR-0146"; }

  revision 2021-01-25 { reference "CR-0122"; }  

  revision 2020-09-30 { reference "CR-bbbb"; }
@@ -31,6 +33,11 @@ module _3gpp-common-managed-function { 
  revision 2019-10-28 { reference S5-193518 ; }

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



  feature Configurable5QISetUnderManagedFunction {

    description "The Configurable5QISet shall be contained under

    ManagedFunction";

  }



  feature MeasurementsUnderManagedFunction {

    description "The MeasurementSubtree shall be contained under ManageElement";

  }
@@ -321,5 +328,9 @@ module _3gpp-common-managed-function { 
    uses trace3gpp:TraceSubtree {

      if-feature TraceUnderManagedFunction ;

    }



    uses fiveqi3gpp:Configurable5QISetSubtree {

      if-feature Configurable5QISetUnderManagedFunction;

    }

  }

}

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

+13 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ module _3gpp-nr-nrm-gnbdufunction { 
    Object Class (IOC) that is part of the NR Network Resource Model (NRM).";

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



  revision 2022-11-02 { reference "CR-0753"; }

  revision 2022-07-28 { reference "CR-0770"; }

  revision 2021-10-28 { reference CR-0607 ; }

  revision 2021-04-30 { reference CR-0490 ; }
@@ -172,6 +173,17 @@ module _3gpp-nr-nrm-gnbdufunction { 
    }

  }



    leaf configurable5QISetRef {

      type types3gpp:DistinguishedName;

      description "DN of the Configurable5QISet that the GNBDUFunction supports (is associated      

        to).";

    }



    leaf dynamic5QISetRef {

      type types3gpp:DistinguishedName;

      description "DN of the Dynamic5QISet that the GNBDUFunction supports (is associated to).";

    }



  augment "/me3gpp:ManagedElement" {



    list GNBDUFunction {