Commit c57e10a4 authored by lengyelb's avatar lengyelb
Browse files

Local merge of branch 28.541_Rel18_CR0770_YANG_Corrections merge request... 

Local merge of branch 28.541_Rel18_CR0770_YANG_Corrections merge request sa5/MnS!364
parent 9f9b5e6a

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

+22 −33
Original line number Diff line number Diff line 
module _3gpp-5gc-nrm-configurable5qiset {

  yang-version 1.1;

  

  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-configurable5qiset;

  prefix Conf5QIs3gpp;

  prefix conf5QIs3gpp;

  

  import _3gpp-common-top { prefix top3gpp; }

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

  import _3gpp-common-subnetwork { prefix subnet3gpp; }

  

  organization "3gpp SA5";

  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -15,12 +12,13 @@ module _3gpp-5gc-nrm-configurable5qiset { 
    (and configurable) to the 5G NFs.";

  reference "3GPP TS 28.541";



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

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

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

  revision 2020-08-04 { reference "CR-0321"; }

  revision 2020-06-03 { reference "CR-0286"; }



  grouping PacketErrorRate {

  grouping PacketErrorRateGrp {

    leaf scalar {

      type uint32 {

        range 0..9 ;
@@ -41,11 +39,6 @@ module _3gpp-5gc-nrm-configurable5qiset { 


  grouping FiveQICharacteristicsGrp {

    description "Represents the FiveQICharacteristics IOC.";

    reference "3GPP TS 28.541";

  }



  list configurableFiveQIs {

    key fiveQIValue;

    leaf fiveQIValue {

      type uint32 {

        range 0..255 ;
@@ -68,27 +61,34 @@ module _3gpp-5gc-nrm-configurable5qiset { 
      type uint32 {

        range 0..127 ;

      }

      mandatory true;

      description "It indicates the Priority Level of a 5QI, as specified

        in TS 23.501.";

    }

    

    leaf packetDelayBudget {

      type uint32 {

        range 0..1023 ;

      }

      mandatory true;

      description "Indicates the Packet Delay Budget (in unit of 0.5ms)of a 5QI, 

        as specified in TS 23.501 ";

    }

    

    list packetErrorRate {

      key "scalar exponent";

      min-elements 1;

      max-elements 1;

      uses PacketErrorRate;

      reference "TS 23.501";

      uses PacketErrorRateGrp;

      description "It indicates the Packet Error Rate of a 5QI,

        as specified in TS 23.501.";

    }



    leaf averagingWindow {

      type uint32 {

        range 0..4095 ;

      }

      mandatory true;

      units ms;

      reference "TS 23.501";

    }
@@ -97,24 +97,20 @@ module _3gpp-5gc-nrm-configurable5qiset { 
      type uint32{

        range 0..4095 ;

      }

      mandatory true;

      units byte;

    }

}



  grouping FiveQiCharacteristicsSubtree {

    description "Represents the FiveQICharacterics IOC.";

    list FiveQICharacteristics {

      key id;

        uses top3gpp:Top_Grp;

          container attributes {

            uses FiveQICharacteristicsGrp;

        }

    }  

  grouping Configurable5QISetGrp {

    description "Represents the Configurable5QISet IOC.

      No attributes defined.";

  }



  grouping Configurable5QISetGrp {

    description "Represents the Configurable5QISet IOC.";

    list configurable5QIs {

  grouping FiveQICharacteristicsSubtree {

    list FiveQICharacteristics {

      description "This specifies the 5QI value and the corresponding

        QoS characteristics for a 5QI.";

      key id;

      uses top3gpp:Top_Grp;

      container attributes {
@@ -133,14 +129,7 @@ module _3gpp-5gc-nrm-configurable5qiset { 
      container attributes {

        uses Configurable5QISetGrp;

      }

      uses FiveQICharacteristicsSubtree;

    }

  }

  

  augment "/subnet3gpp:SubNetwork" {

    uses Configurable5QISetSubtree;

  }



  augment "/me3gpp:ManagedElement" {

    uses Configurable5QISetSubtree;

  }

}
 
 No newline at end of file

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

+7 −1
Original line number Diff line number Diff line 
module _3gpp-5gc-nrm-dynamic5qiset {

  yang-version 1.1;

  

  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-dynamic5qiset;

  prefix dyn5QIs3gpp;
@@ -15,6 +14,7 @@ module _3gpp-5gc-nrm-dynamic5qiset { 
    characteristics.";

  reference "3GPP TS 28.541";



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

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

  revision 2020-10-01 { reference "CR-0393"; }

  revision 2020-08-06 { reference "CR-0333"; }
@@ -22,6 +22,11 @@ module _3gpp-5gc-nrm-dynamic5qiset { 
  grouping Dynamic5QISetGrp {

    description "Represents the Dynamic5QISet IOC.";

    list dynamic5QIs {

      description "This IOC specifies the dynamically assigned 5QIs 

        including their QoS characteristics, see 3GPP TS 23.501. 

        The instance of this IOC shall not be created or modified by the 

        MnS consumer except for the instance associated to 

        PCFFunction MOI or SMFFunction MOI when the PCF is not deployed.";

    key id;

    uses top3gpp:Top_Grp;

    container attributes {
@@ -40,6 +45,7 @@ module _3gpp-5gc-nrm-dynamic5qiset { 
      container attributes {

        uses Dynamic5QISetGrp;

      }

      uses Conf5QIs3gpp:FiveQICharacteristicsSubtree;

    }  

  }

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

+3 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ module _3gpp-nr-nrm-dlbofunction { 
    Model (NRM).";

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



  revision 2022-03-25 { reference "CR-XXXX"; }

  revision 2022-03-25 { reference "CR-0683"; }

  revision 2021-10-22 { reference "CR-0577"; }  



  feature DLBOUnderGNBCUCPFunction {
@@ -49,6 +49,7 @@ module _3gpp-nr-nrm-dlbofunction { 
        type int32 { range "-20..20"; }

        units "0.5 dB";

    }



    leaf maximumDeviationHoTriggerHigh {

      description "This parameter defines the maximum allowed upper 

        deviation of the Handover Trigger, from the default point of

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

+11 −9
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ module _3gpp-nr-nrm-gnbcucpfunction { 
  import _3gpp-common-managed-function { prefix mf3gpp; }

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

  import _3gpp-common-top { prefix top3gpp; }

  import _3gpp-nr-nrm-rrmpolicy { prefix nrrrmpolicy3gpp; }



  organization "3GPP SA5";

  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -15,6 +14,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { 
    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-07-28 { reference "CR-0770"; }

  revision 2021-11-06 { reference "CR-0611" ; }

  revision 2021-11-05 { reference "CR-0609"; }

  revision 2020-10-02 { reference CR-0384 ; }
@@ -25,9 +25,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { 
  revision 2020-04-28 { reference "0260"; }

  revision 2020-02-14 { reference S5-20XXXX ; }

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

  revision 2019-06-17 {

    description "Initial revision";

  }

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



  feature DESManagementFunction {

    description "Classs representing Distributed SON Energy Saving feature";
@@ -46,7 +44,6 @@ module _3gpp-nr-nrm-gnbcucpfunction { 
    description "Represents the GNBCUCPFunction IOC.";

    reference "3GPP TS 28.541";

    uses mf3gpp:ManagedFunctionGrp;

    uses nrrrmpolicy3gpp:RRMPolicy_Grp;



    leaf gNBId {

      description "Identifies a gNB within a PLMN. The gNB Identifier (gNB ID)
@@ -103,23 +100,28 @@ module _3gpp-nr-nrm-gnbcucpfunction { 
      type string;

      description "List of nodes to which handovers over  Xn are prohibited.";

    }



    leaf configurable5QISetRef {

      type types3gpp:DistinguishedName;

      description "DN of the Configurable5QISet that the GNBCUCPFunction supports (is associated to).";

      description "DN of the Configurable5QISet that the GNBCUCPFunction 

        supports (is associated to).";

    }



    leaf-list x2HOBlackList {

      type string;

      description "List of nodes to which handovers over X2 are prohibited.";

    }



    leaf dynamic5QISetRef {

      type types3gpp:DistinguishedName;

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

      description "DN of the Dynamic5QISet that the GNBCUCPFunction supports 

        (is associated to).";

    }



    leaf dCHOControl {

      type boolean;

      description "This attribute determines whether the CHO function is enabled or disabled.";

      description "This attribute determines whether the CHO function is 

        enabled or disabled.";

    }



    leaf dDAPSHOControl {

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

+1 −2
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ module _3gpp-nr-nrm-gnbcuupfunction { 
  import _3gpp-common-managed-function { prefix mf3gpp; }

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

  import _3gpp-common-top { prefix top3gpp; }

  import _3gpp-nr-nrm-rrmpolicy { prefix nrrrmpolicy3gpp; }

  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }



  organization "3GPP SA5";
@@ -16,6 +15,7 @@ module _3gpp-nr-nrm-gnbcuupfunction { 
    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-07-28 { reference "CR-0770"; }

  revision 2020-11-05 { reference CR-0412 ; }

  revision 2020-08-06 { reference "CR-0333"; }

  revision 2020-08-03 { reference "CR-0321"; }
@@ -98,7 +98,6 @@ module _3gpp-nr-nrm-gnbcuupfunction { 
    description "Represents the GNBCUUPFunction IOC.";

    reference "3GPP TS 28.541";

    uses mf3gpp:ManagedFunctionGrp; 

    uses nrrrmpolicy3gpp:RRMPolicy_Grp;



    leaf gNBCUUPId {

      type uint64 {