Commit f7be5688 authored by lengyelb's avatar lengyelb
Browse files

changed containment of -configurable5qiset from augment to grouping/uses. All... 

changed containment of -configurable5qiset from augment to grouping/uses. All git changes are here, but in word some of the subnetwork and managed-element changes are in a 28.623 CR.
parent 5d6afde4

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

+2 −12
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";
@@ -14,7 +12,7 @@ module _3gpp-5gc-nrm-configurable5qiset { 
    (and configurable) to the 5G NFs.";

  reference "3GPP TS 28.541";



  revision 2022-07-27 { reference "CR-17-541-yang-corrections"; }

  revision 2022-07-27 { reference "CR-0769"; }

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

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

  revision 2020-08-04 { reference "CR-0321"; }
@@ -134,12 +132,4 @@ module _3gpp-5gc-nrm-configurable5qiset { 
      uses FiveQICharacteristicsSubtree;

    }

  }



  augment "/subnet3gpp:SubNetwork" {

    uses Configurable5QISetSubtree;

  }



  augment "/me3gpp:ManagedElement" {

    uses Configurable5QISetSubtree;

  }

}

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

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ module _3gpp-5gc-nrm-dynamic5qiset { 
    characteristics.";

  reference "3GPP TS 28.541";



  revision 2022-07-27 { reference "CR-17-541-yang-corrections"; }

  revision 2022-07-27 { reference "CR-0769"; }

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

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

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

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

+10 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ module _3gpp-common-managed-element { 
  import _3gpp-common-subscription-control { prefix subscr3gpp; }

  import _3gpp-common-fm { prefix fm3gpp; }

  import _3gpp-common-trace { prefix trace3gpp; }

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

  

  organization "3GPP SA5";

  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -28,6 +29,7 @@ module _3gpp-common-managed-element { 
      3GPP TS 28.620 

      Umbrella Information Model (UIM)";



  revision 2022-07-26 { reference CR-0180 ; }

  revision 2021-01-16 { reference "CR-0120"; }  

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

  revision 2020-08-03 { reference "CR-0095"; }
@@ -37,6 +39,10 @@ module _3gpp-common-managed-element { 
  revision 2019-06-17 { reference " S5-203316"; }

  revision 2019-05-08 { reference "Initial revision"; }

  

  feature Configurable5qisetUnderManagedElement {

    description "The Configurable5qiset shall be contained under ManagedElement";

  }

  

  feature MeasurementsUnderManagedElement {

    description "The MeasurementSubtree shall be contained under

      ManagedElement";
@@ -244,5 +250,8 @@ module _3gpp-common-managed-element { 
      if-feature TraceUnderManagedElement;

    }



    uses conf5QIs3gpp:Configurable5QISetSubtree {

      if-feature Configurable5qisetUnderManagedElement;

    }    

  }    

}
 
 No newline at end of file

yang-models/_3gpp-common-subnetwork.yang

+11 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ module _3gpp-common-subnetwork { 
  import _3gpp-common-fm { prefix fm3gpp; }

  import _3gpp-common-trace { prefix trace3gpp; }

  import ietf-yang-schema-mount { prefix yangmnt; }

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

  

  organization "3GPP SA5";

  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -28,6 +29,7 @@ module _3gpp-common-subnetwork { 
      3GPP TS 28.620 

      Umbrella Information Model (UIM)";

  

  revision 2022-07-26 { reference CR-0180 ; }

  revision 2021-01-16 { reference "CR-0120"; }  

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

  revision 2020-06-08 { reference "CR-0092"; }
@@ -49,6 +51,10 @@ module _3gpp-common-subnetwork { 
    reference "Initial revision";

  }



  feature Configurable5qisetUnderSubNetwork {

    description "The Configurable5qiset shall be contained under SubNetwork";

  }

  

  feature ExternalsUnderSubNetwork {

    description "Classes representing external entities like EUtranFrequency, 

      ExternalGNBCUCPFunction, ExternalENBFunction
@@ -204,6 +210,10 @@ module _3gpp-common-subnetwork { 
      if-feature TraceUnderSubNetwork;

    }

    

    uses conf5QIs3gpp:Configurable5QISetSubtree {

      if-feature Configurable5qisetUnderSubNetwork;

    }



    yangmnt:mount-point children-of-SubNetwork {

      description "Mountpoint for ManagedElement";

      reference "RFC8528 YANG Schema Mount";

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

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +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-27 { reference "CR-17-541-yang-corrections"; }

  revision 2022-07-27 { reference "CR-0769"; }

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

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

  revision 2020-10-02 { reference CR-0384 ; }