Commit 1e4c9159 authored by mouqueta's avatar mouqueta
Browse files

Merge branch 'Integration_Rel18_SA5_162_YANG' into 'Rel-18' 

Integration_Rel18_SA5_162_YANG into Rel-18

See merge request !1786
parents 097ef14d acffdd2d

yang-models/_3gpp-5g-common-yang-types.yang

+4 −24
Original line number Diff line number Diff line
@@ -3,17 +3,18 @@ module _3gpp-5g-common-yang-types { 
  namespace "urn:3gpp:sa5:_3gpp-5g-common-yang-types";

  prefix "types5g3gpp";

  

  import ietf-yang-types { prefix yang; }



  import _3gpp-common-yang-types { prefix types3gpp; }



  organization "3GPP SA5";

  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";

  description "The model defines common types for 5G networks and 

    network slicing.

    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 

    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 

    TTA, TTC). All rights reserved.";

  reference "3GPP TS 28.541";



  revision 2025-08-18 { reference CR-1557; }

  revision 2024-10-06 { reference CR-1389; }

  revision 2024-05-24 { reference CR-1273 ; } 

  revision 2023-09-18 { reference CR-1043 ; }
@@ -76,27 +77,6 @@ module _3gpp-5g-common-yang-types { 
      d) For a 5G SA (Stand Alone), it has a non-null value.";

  }

  

  grouping SNssai {

    description 

      "Single Network Slice Selection Assistance Information(S-NSSAI)";

    reference "3GPP TS 23.003";

  

    leaf sd {

      description "Slice Differentiator

        If not needed, the value can be set to ff:ff:ff.";

      type yang:hex-string {

        length 8;

      }

      reference "3GPP TS 23.003";

    }

    

    leaf sst {

      type uint8;

      description "Slice/Service Type.

         Values 0 to 127 belong to standardized SST range and are defined in 

         3GPP TS 23.501. Values 128 to 255 belong to operator-specific range.";

    }

  }

    

  grouping PlmnIdNid {

    description "Represents the SCP domain specific information as defined
@@ -120,7 +100,7 @@ module _3gpp-5g-common-yang-types { 
      comprised of an SST (Slice/Service type) and an optional 

      SD (Slice Differentiator) field";

    uses types3gpp:PLMNId;

    uses SNssai;

    uses types3gpp:SNssai;

  }



  typedef CommModelType {

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

+4 −3
Original line number Diff line number Diff line
@@ -5,18 +5,19 @@ module _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl { 
  prefix gtpUPathQMCtrl3gpp;

  

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

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

  import _3gpp-5gc-nrm-smffunction { prefix smf3gpp; }

  import _3gpp-common-top { prefix top3gpp; }

  import _3gpp-common-yang-types { prefix types3gpp; }

  

  organization "3gpp SA5";

  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";

  description "This IOC represents the capabilities and properties for control 

    of GTP-U path QoS monitoring defined in 3GPP TS 23.501.

    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 

    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 

    TTA, TTC). All rights reserved.";

  reference "3GPP TS 28.541";



  revision 2025-08-18 { reference CR-1557 ; }

  revision 2023-09-18 { reference CR-1043 ; } 

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

  revision 2020-09-30 { reference "CR-0393"; }
@@ -70,7 +71,7 @@ module _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl { 
      description "The S-NSSAIs for which the the GTP-U path QoS monitoring is 

        to be performed.";

      reference "3GPP TS 23.003";

      uses types5g3gpp:SNssai;

      uses types3gpp:SNssai;

     }

     

    leaf-list monitoredDSCPs {

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

+3 −3
Original line number Diff line number Diff line
@@ -7,8 +7,7 @@ module _3gpp-5gc-nrm-QFQoSMonitoringControl { 
  import _3gpp-common-managed-element { prefix me3gpp; }

  import _3gpp-5gc-nrm-smffunction { prefix smf3gpp; }

  import _3gpp-common-top { prefix top3gpp; }

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



  import _3gpp-common-yang-types { prefix types3gpp; }

  organization "3gpp SA5";  

  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";

  description "This IOC represents the capabilities and properties for control
@@ -19,6 +18,7 @@ in 3GPP TS 23.501. 
    TTA, TTC). All rights reserved.";

  reference "3GPP TS 28.541";



  revision 2025-08-18 { reference CR-1557 ; }

  revision 2023-09-24 { reference CR-0916; }

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

  revision 2020-08-03 { reference "CR-0321"; }
@@ -63,7 +63,7 @@ in 3GPP TS 23.501. 
       per UE is to be performed.";

      reference "3GPP TS 23.003";

      key "sd sst";

           uses types5g3gpp:SNssai;}

           uses types3gpp:SNssai;}

     

    leaf-list qFMonitored5QIs {

      description "The 5QIs for which the QoS monitoring per QoS flow

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

+3 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ module _3gpp-5gc-nrm-amffunction { 
    TTA, TTC). All rights reserved.";

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

  

  revision 2025-08-18 { reference CR-1557 ; }

  revision 2024-10-06 { reference CR-1389; }

  revision 2024-04-04 { reference CR-1139; }

  revision 2023-09-18 { reference CR-1043 ; }
@@ -236,7 +237,7 @@ module _3gpp-5gc-nrm-amffunction { 
      key idx;

      unique "sst sd";

      leaf idx { type uint32; }

      uses types5g3gpp:SNssai;

      uses types3gpp:SNssai;

    }

  }

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

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

  description "This IOC represents the AMF Region which consists one or

    multiple AMF Sets.

    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 

    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 

    TTA, TTC). All rights reserved.";

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



  revision 2025-08-18 { reference CR-1557 ; }

  revision 2024-05-24 { reference CR-1273 ; } 

  revision 2023-09-18 { reference CR-1043 ; } 

  revision 2022-01-07 { reference CR-0643; }
@@ -57,7 +58,7 @@ module _3gpp-5gc-nrm-amfregion { 
      //conditional support only if the network slicing feature is supported.

      reference "3GPP TS 23.003";

      key "sd sst";

      uses types5g3gpp:SNssai;

      uses types3gpp:SNssai;

    }

    

    leaf aMFRegionId {