Commit f4ae3bda authored by lengyelb's avatar lengyelb Committed by lengyelb
Browse files

update x

parent f4ff027d

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

+9 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ module _3gpp-common-managed-element { 
  import _3gpp-common-files { prefix files3gpp; }

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

  import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; }

  import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; }



  organization "3GPP SA5";

  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -50,6 +51,10 @@ module _3gpp-common-managed-element { 
  revision 2019-06-17 { reference " S5-203316"; }

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

  

  feature ECMappingRuleUnderManagedElement {

    description "ECMappingRule shall be contained under ManagedElement.";

  }

  

  feature EcmConnectionInfoUnderManagedElement  {

    description "The EcmConnectionInfo shall be contained under

    ManagedElement";
@@ -312,5 +317,9 @@ module _3gpp-common-managed-element { 
    uses econn3gpp:EcmConnectionInfoSubtree {

      if-feature EcmConnectionInfoUnderManagedElement;

    }



    uses ecmap3gpp:NGRANECMappingRuleSubtree {

      if-feature EcmConnectionInfoUnderManagedElement;

    }

  }    

}

yang-models/_3gpp-common-subnetwork.yang

+10 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ module _3gpp-common-subnetwork { 
  import _3gpp-common-files { prefix files3gpp; }

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

  import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; }

  import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; }



  organization "3GPP SA5";

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

      Umbrella Information Model (UIM)";

  

  revision 2024-08-18 { reference CR-1336 ; } 

  revision 2024-01-30 { reference CR-0328 ; } 

  revision 2023-11-14 { reference CR-0305 ; } 

  revision 2023-09-18 { reference CR-0271 ; }
@@ -61,6 +63,10 @@ module _3gpp-common-subnetwork { 
    reference "Initial revision";

  }



  feature ECMappingRuleUnderSubNetwork {

    description "ECMappingRule shall be contained under SubNetwork.";

  }

  

  feature EcmConnectionInfoUnderSubNetwork {

    description "The EcmConnectionInfo shall be contained under

    Subnetwork";
@@ -269,6 +275,10 @@ module _3gpp-common-subnetwork { 
      reference "RFC8528 YANG Schema Mount";

    }

    

    uses ecmap3gpp:NGRANECMappingRuleSubtree {

      if-feature EcmConnectionInfoUnderSubNetwork;

    }

    

    // augment external parts here

  }

}
 
 No newline at end of file

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

+0 −21
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ module _3gpp-nr-nrm-ecmappingrule { 
  prefix ecmap3gpp;

  

  import _3gpp-common-top { prefix top3gpp; }

  import _3gpp-common-subnetwork { prefix subnet3gpp; }

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

  

  organization "3gpp SA5";

  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -17,14 +15,6 @@ module _3gpp-nr-nrm-ecmappingrule { 


  revision 2024-08-12 { reference CR-1336 ; } 

  

  feature ECMappingRuleUnderSubNetwork {

    description "ECMappingRule shall be contained under SubNetwork.";

  }  



  feature ECMappingRuleUnderManagedElement {

    description "ECMappingRule shall be contained under ManagedElement.";

  }

  

  grouping NGRANECMappingRuleGrp {

    description "Represents the NGRANECMappingRule IOC.";

    leaf eCMRInputMinValue {
@@ -61,15 +51,4 @@ module _3gpp-nr-nrm-ecmappingrule { 
      }

    }

  }



  augment "/subnet3gpp:SubNetwork" {

    if-feature ECMappingRuleUnderSubNetwork;

      when '"1" = "1"';

        uses NGRANECMappingRuleSubtree;

  }



  augment "/me3gpp:ManagedElement" {

    if-feature ECMappingRuleUnderManagedElement;

      uses NGRANECMappingRuleSubtree;

  }

}