Commit fe52fd6b authored by lengyelb's avatar lengyelb
Browse files

Merge branch 'YANG_Correction_28.623_28.541_Rel18-SA5-155' into 'Integration_Rel18_SA5_155_YANG' 

YANG_Correction_28.623_28.541_Rel18-SA5-155 into Integration_Rel18_SA5_155_YANG

See merge request !1111
parents b050d4f3 db6e8993

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

+16 −1
Original line number Diff line number Diff line
@@ -11,16 +11,31 @@ module _3gpp-5g-common-yang-types { 
  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 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 

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

    TTA, TTC). All rights reserved.";

  reference "3GPP TS 28.541";



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

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

  revision 2023-05-10 { reference CR-0916; }

  revision 2021-08-05 { reference S5-214053/CR-0518; }

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

  revision 2019-10-20 { reference "Initial version."; }

 

  typedef NRTAC {

    type string;

    description "This holds the identity of the common Tracking Area Code 

      for the PLMNs. 



      allowedValues:

      a) It is the TAC or Extended-TAC. 

      b) A cell can only broadcast one TAC or Extended-TAC. See TS 36.300, 

        subclause 10.1.7 (PLMNID and TAC relation).

      c) TAC is defined in subclause 19.4.2.3 of 3GPP TS 23.003

       and Extended-TAC is defined in subclause 9.3.1.29 of 3GPP TS 38.473.

      d) For a 5G SA (Stand Alone), it has a non-null value.";

  }

  

  grouping SNssai {

    description 

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

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 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 

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

    TTA, TTC). All rights reserved.";

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



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

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

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

  revision 2020-11-06 { reference CR-0412 ; }
@@ -45,7 +46,7 @@ module _3gpp-5gc-nrm-amfregion { 
                   reference "TS 38.413 clause 9.3.3.10";

      min-elements 1;

      config false;

      type types3gpp:Tac;

      type types5g3gpp:NRTAC;

    }

    

    list sNSSAIList {

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

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

  description "This IOC represents the AMF Set which consists of some AMFs 

    that serve a given area and Network Slice.

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

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

    TTA, TTC). All rights reserved.";

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



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

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

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

  revision 2020-11-06 { reference CR-0412 ; }
@@ -44,7 +45,7 @@ module _3gpp-5gc-nrm-amfset { 
      reference "TS 38.413 clause 9.3.3.10";

      min-elements 1;

      config false;

      type types3gpp:Tac;

      type types5g3gpp:NRTAC;

    }

    

    list sNSSAIList {

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

+25 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ module _3gpp-5gc-nrm-neffunction { 
    TTA, TTC). All rights reserved.";

  reference "3GPP TS 28.541";

  

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

  revision 2024-04-12 { reference CR-1218 ; } 

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

  revision 2023-09-18 { reference CR-1043 ; }
@@ -247,6 +248,30 @@ module _3gpp-5gc-nrm-neffunction { 
        - True: UAS NF functionality is supported by the NEF.

        - False (default): UAS NF functionality is not supported by the NEF";

    }

    

    leaf multiMemAfSessQosInd {

      type boolean;

      default false;

      description "This attribute indicates whether the NEF supports 

        Multi-member AF session with required QoS functionality:



        - TRUE: Multi-member AF session with required QoS functionality is 

        supported by the NEF

        - FALSE (default): Multi-member AF session with required QoS 

        functionality is not supported by the NEF.";

    }

      

    leaf memberUESelAssistInd {

      type boolean;

      default false;

      description "This attribute indicates whether the NEF supports member 

        UE selection assistance functionality:



        - TRUE: member UE selection assistance functionality is supported by 

        the NEF

        - FALSE (default): member UE selection assistance functionality is 

        not supported by the NEF.";

    }

  }

  

  grouping NEFFunctionGrp {

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

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

  description "This IOC represents the PCF function in 5GC. For more 

    information about the PCF, see 3GPP TS 23.501.

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

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

    TTA, TTC). All rights reserved.";

  reference "3GPP TS 28.541";

  

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

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

  revision 2023-04-26 { reference CR-0916; }

  revision 2020-11-08 { reference CR-0412 ; }
@@ -27,8 +28,8 @@ module _3gpp-5gc-nrm-pcffunction { 
  revision 2019-10-25 { reference "S5-194457 S5-193518"; }

  revision 2019-05-22 { reference "initial revision"; }

  

  grouping PCFFuntionGrp {

    description "Represents the PCFFuntion IOC";

  grouping PCFFunctionGrp {

    description "Represents the PCFFunction IOC";

    uses mf3gpp:ManagedFunctionGrp;

    

    list pLMNIdList {
@@ -94,7 +95,7 @@ module _3gpp-5gc-nrm-pcffunction { 
      key id;

      uses top3gpp:Top_Grp;

      container attributes {

        uses PCFFuntionGrp;

        uses PCFFunctionGrp;

      }

      uses mf3gpp:ManagedFunctionContainedClasses;

    }