Commit 2d597129 authored by lengyelb's avatar lengyelb
Browse files

Merge branch... 

Merge branch 'S5_213399_Rel_17_CR_28.541_Correction_of_Dynamic5QISet_definition' into 'Integration_Rel17_SA5_137_YANG'

S5 213399 rel 17 cr 28.541 correction of dynamic5 qi set definition

See merge request sa5/MnS!118
parents 5d15d51e 7d8f9ac4

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

+29 −8
Original line number Diff line number Diff line
@@ -37,7 +37,13 @@ module _3gpp-5gc-nrm-configurable5qiset { 
    }

  }



  grouping FiveQICharacteristics {

  grouping FiveQICharacteristicsGrp {

    description "Represents the FiveQICharacteristics IOC.";

    reference "3GPP TS 28.541";

  }

 

  list configurableFiveQIs {

    key fiveQIValue;

    leaf fiveQIValue {

      type uint32 {

        range 0..255 ;
@@ -94,14 +100,29 @@ module _3gpp-5gc-nrm-configurable5qiset { 
    }

}



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

    list configurable5QIs {

      key "fiveQIValue";

      uses FiveQICharacteristics;

      key id;

      uses top3gpp:Top_Grp;

      container attributes {

        uses FiveQICharacteristicsGrp;

      }

    }  

}    





  grouping Configurable5QISetSubtree {

    list Configurable5QISet {

      description "Specifies the non-standardized 5QIs, including their QoS

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

+6 −4
Original line number Diff line number Diff line
@@ -21,9 +21,11 @@ module _3gpp-5gc-nrm-dynamic5qiset { 
  grouping Dynamic5QISetGrp {

    description "Represents the Dynamic5QISet IOC.";

    list dynamic5QIs {

      key "fiveQIValue";

      description "Represents the Dynamic5QISet IOC.";

      uses Conf5QIs3gpp:FiveQICharacteristics;

    key id;

    uses top3gpp:Top_Grp;

    container attributes {

      uses Conf5QIs3gpp:FiveQICharacteristicsGrp;

      }

    }

  }