Commit ba0c5dfe authored by lengyelb's avatar lengyelb
Browse files

Merge branch 'YANG-Corrections-Rel19-SA5-165_28.111_28.623_28.541' into... 

Merge branch 'YANG-Corrections-Rel19-SA5-165_28.111_28.623_28.541' into 'Integration_Rel19_SA5_165_YANG'

YANG-Corrections-Rel19-SA5-165_28.111-0060_28.623_28.541-1682 into Integration

See merge request !2012
parents 5a6082c0 5923c683

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

+31 −4
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ module _3gpp-5g-common-yang-types { 
    TTA, TTC). All rights reserved.";

  reference "3GPP TS 28.541";



  revision 2026-01-07 { reference CR- ; }

  revision 2025-11-07 { reference CR-1640 ; }

  revision 2025-11-01 { reference CR-1657 ; }

  revision 2025-07-25 { reference CR-1558 ; }
@@ -110,6 +111,29 @@ module _3gpp-5g-common-yang-types { 
    }

  }



  grouping VendorSpecificFeatureGrp {

    description "This <<dataType>> represents the information of vendor 

    specific feature as defined in clause 6.1.6.2.62 of 3GPP TS 29.510";



    leaf featureName {

      type string;

      mandatory true;

      config false;

      description "It is a string representing a proprietary feature 

      specific to a given vendor.

      It is recommended that the case convention for these strings is the

       same as for enumerated data types (i.e. UPPER_WITH_UNDERSCORE; 

       see 3GPP TS 29.501, clause 5.1.1).";

    }

    leaf featureVersion {

      type string;

      mandatory true;

      config false;

      description "It is a string representing the version of the feature.";

    }



  }



  grouping IpInterfaceGrp {

    leaf-list ipv4EndpointAddresses {

      description "Available endpoint IPv4 address(es) of
@@ -491,12 +515,15 @@ module _3gpp-5g-common-yang-types { 


  grouping CaraConfigurationGrp {

    description "This data type represents the configuration used for 

    an NR mobile node (e.g., IAB-node or MWAB), to perform certificate enrolment procedure with

    Certification Authority server (CA/RA) as specified in TS 28.315 clause 5.3";

    an NR mobile node (e.g., IAB-node or MWAB), to perform certificate 

    enrolment procedure with Certification Authority server (CA/RA) 

    as specified in TS 28.315 clause 5.3";

    

    leaf caraAddress {

      type inet:host;

      description "IP address or FQDN of the CMP (Certificate Management Protocol) server";

      description "IP address or FQDN of the CMP (Certificate Management 

      Protocol)

       server";

    }



    leaf portNumber {

yang-models/_3gpp-5gc-nrm-managed-nfprofile.yang

+21 −9
Original line number Diff line number Diff line
@@ -579,15 +579,27 @@ grouping ManagedNFProfileGrp { 
      min-elements 1;

      uses nfs3gpp:NFServiceGrp;

    }

 //    leaf supportedVendorSpecificFeatures {

 //      description "It indicates a map of Vendor-Specific features, where the

 //       key of the map is the IANA-assigned SMI Network Management Private

 //       Enterprise Codes and the value of each entry of the map shall be

 //       a list (array) of VendorSpecificFeature objects as defined

 //       in the clause 5.3.247.";

 //      type string;

 //      min-elements 1;

 //    }    attributeValuePair with no defintion anywhere

     list supportedVendorSpecificFeatures {

       description "It indicates a map of Vendor-Specific features, where the

        key of the map is the IANA-assigned SMI Network Management Private

        Enterprise Codes and the value of each entry of the map shall be

        a list (array) of VendorSpecificFeature objects as defined

        in the clause 5.3.247.";

        key "enterpriseCode";



        leaf enterpriseCode {

          type uint32;

          description "IANA-assigned SMI Network Management Private Enterprise Code";

        }



        list vendorSpecificFeature {

          key "featureName";

          config false;

          description "VendorSpecificFeature objects as defined

        in the clause 5.3.247.";

        uses types5g3gpp:VendorSpecificFeatureGrp;

        }      

     }    



    list selectionConditions {

      description "Identifications of Credentials Holder or Default Credentials

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

+21 −0
Original line number Diff line number Diff line
@@ -220,6 +220,27 @@ module _3gpp-5gc-nrm-nfservice { 
      pattern '[A-Fa-f0-9]*';

    }

  }

  list supportedVendorSpecificFeatures {

    description "It indicates a map of Vendor-Specific features, where the

     key of the map is the IANA-assigned SMI Network Management Private

     Enterprise Codes and the value of each entry of the map shall be

     a list (array) of VendorSpecificFeature objects as defined

     in the clause 5.3.247.";

     key "enterpriseCode";

     

     leaf enterpriseCode {

       type uint32;

       description "IANA-assigned SMI Network Management Private Enterprise Code";

     }



     list vendorSpecificFeature {

       key "featureName";

       config false;

       description "VendorSpecificFeature objects as defined

      in the clause 5.3.247.";

     uses types5g3gpp:VendorSpecificFeatureGrp;

     }      

  }      

  

  grouping ipEndPoint {

    choice address {

yang-models/_3gpp-common-fm.yang

+3 −3
Original line number Diff line number Diff line
@@ -12,13 +12,14 @@ module _3gpp-common-fm { 
  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";



  description "Defines a Fault Management model

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

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

    TTA, TTC). All rights reserved.";

  reference "3GPP TS 28.111";



  revision 2026-01-25 { reference "CR-0060"; }  // common for R19, R20

  revision 2025-11-07 { reference "CR-0057"; }  

  revision 2025-08-13 { reference "CR-0050 CR-0051 CR-0053 CR-0054"; }

  revision 2025-05-01 { reference "CR-0042 CR-0043"; }  // common for R18, R19

  revision 2025-05-01 { reference "CR-0042 CR-0043"; }  

  revision 2025-03-25 { reference "CR-0025 CR-0026"; } 

  revision 2024-05-12 { 

    description "The definition of the module was from TS 28.623 to TS 28.111";
@@ -704,7 +705,6 @@ module _3gpp-common-fm { 
    }



    list comments {

      config false ;

      yext3gpp:notNotifyable;

      description "List of comments and data about the comments.";

      key idx;

yang-models/_3gpp-common-trace.yang

+87 −49
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ module _3gpp-common-trace { 
  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";



  description "Trace handling

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

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

    TTA, TTC). All rights reserved.";

  reference "3GPP TS 28.623

      Generic Network Resource Model (NRM)
@@ -25,7 +25,8 @@ module _3gpp-common-trace { 
      Integration Reference Point (IRP);

      Information Service (IS)" ;



  revision 2025-10-07 { reference "CR-0573" ; }    // common for rel-19, rel-20

  revision 2026-02-07 { reference "CR-1682" ; }

  revision 2025-10-07 { reference "CR-0573" ; }    

  revision 2025-10-01 { reference "CR-0578" ; }

  revision 2025-08-07 { reference "CR-0551 CR-0552 CR-0562" ; }

  revision 2025-05-07 { reference "CR-0532 CR-0536 CR-0540" ; }
@@ -195,18 +196,7 @@ module _3gpp-common-trace { 
      attribute triggeringEvents. For each triggering event the first and

      last message (start/stop triggering event) to record  are specified.";



    list listOfInterfaces {

      key idx;



      description "Specifies the interfaces that need to be traced in the given

        ManagedEntityFunction.The attribute is applicable only for Trace. In

        case this attribute is not used, it carries a null semantic.";

      reference "Clause 5.5 of 3GPP TS 32.422 for additional details on the

        allowed values.";



      leaf idx { type uint32 ; }



      leaf-list MSCServerInterfaces {

      typedef MSCServerInterfaces {

        type enumeration {

          enum A ;

          enum Iu-CS ;
@@ -220,14 +210,14 @@ module _3gpp-common-trace { 
          enum CAP ;

        }

      }

      leaf-list MGWInterfaces {

      typedef MGWInterfaces {

        type enumeration {

          enum Mc ;

          enum Nb-UP ;

          enum Iu-UP ;

        }

      }

      leaf-list RNCInterfaces {

      typedef RNCInterfaces {

        type enumeration {

          enum Iu-CS ;

          enum Iu-PS ;
@@ -236,7 +226,7 @@ module _3gpp-common-trace { 
          enum Uu ;

        }

      }

      leaf-list SGSNInterfaces {

      typedef SGSNInterfaces {

        type enumeration {

          enum Gb ;

          enum Iu-PS ;
@@ -252,14 +242,14 @@ module _3gpp-common-trace { 
          enum S13 ;

        }

      }

      leaf-list GGSNInterfaces {

      typedef GGSNInterfaces {

        type enumeration {

          enum Gn ;

          enum Gi ;

          enum Gmb ;

        }

      }

      leaf-list S-CSCFInterfaces {

      typedef S-CSCFInterfaces {

        type enumeration {

          enum Mw ;

          enum Mg ;
@@ -267,13 +257,13 @@ module _3gpp-common-trace { 
          enum Mi ;

        }

      }

      leaf-list P-CSCFInterfaces {

      typedef P-CSCFInterfaces {

        type enumeration {

          enum Gm ;

          enum Mw ;

        }

      }

      leaf-list I-CSCFInterfaces {

      typedef I-CSCFInterfaces {

        type enumeration {

          enum Cx ;

          enum Dx ;
@@ -281,26 +271,26 @@ module _3gpp-common-trace { 
          enum Mw ;

        }

      }

      leaf-list MRFCInterfaces {

      typedef MRFCInterfaces {

        type enumeration {

          enum Mp ;

          enum Mr ;

        }

      }

      leaf-list MGCFInterfaces {

      typedef MGCFInterfaces {

        type enumeration {

          enum Mg ;

          enum Mj ;

          enum Mn ;

        }

      }

      leaf-list IBCFInterfaces {

      typedef IBCFInterfaces {

        type enumeration {

          enum Ix ;

          enum Mx ;

        }

      }

      leaf-list E-CSCFInterfaces {

      typedef E-CSCFInterfaces {

        type enumeration {

          enum Mw ;

          enum Ml ;
@@ -308,14 +298,14 @@ module _3gpp-common-trace { 
          enum Mi-Mg ;

        }

      }

      leaf-list BGCFInterfaces {

      typedef BGCFInterfaces {

        type enumeration {

          enum Mi ;

          enum Mj ;

          enum Mk ;

        }

      }

      leaf-list ASInterfaces {

      typedef ASInterfaces {

        type enumeration {

          enum Dh ;

          enum Sh ;
@@ -323,7 +313,7 @@ module _3gpp-common-trace { 
          enum Ut ;

        }

      }

      leaf-list HSSInterfaces {

      typedef HSSInterfaces {

        type enumeration {

          enum MAP-C ;

          enum MAP-D ;
@@ -335,19 +325,19 @@ module _3gpp-common-trace { 
          enum Sh ;

        }

      }

      leaf-list EIRInterfaces {

      typedef EIRInterfaces {

        type enumeration {

          enum MAP-F ;

          enum S13 ;

          enum MAP-Gf ;

        }

      }

      leaf-list BM-SCInterfaces {

      typedef BM-SCInterfaces {

        type enumeration {

          enum Gmb ;

        }

      }

      leaf-list MMEInterfaces {

      typedef MMEInterfaces {

        type enumeration {

          enum S1-MME ;

          enum S3 ;
@@ -357,7 +347,7 @@ module _3gpp-common-trace { 
          enum S13 ;

        }

      }

      leaf-list SGWInterfaces {

      typedef SGWInterfaces {

        type enumeration {

          enum S4 ;

          enum S5 ;
@@ -366,7 +356,7 @@ module _3gpp-common-trace { 
          enum Gxc ;

        }

      }

      leaf-list PDN_GWInterfaces {

      typedef PDN_GWInterfaces {

        type enumeration {

          enum S2a ;

          enum S2b ;
@@ -378,13 +368,13 @@ module _3gpp-common-trace { 
          enum SGi ;

        }

      }

      leaf-list eNBInterfaces {

      typedef eNBInterfaces {

        type enumeration {

          enum S1-MME ;

          enum X2 ;

        }

      }

      leaf-list en-gNBInterfaces {

      typedef en-gNBInterfaces {

        type enumeration {

          enum S1-MME ;

          enum X2 ;
@@ -393,7 +383,7 @@ module _3gpp-common-trace { 
          enum E1 ;

        }

      }

      leaf-list AMFInterfaces {

      typedef AMFInterfaces {

        type enumeration {

          enum N1 ;

          enum N2 ;
@@ -407,38 +397,38 @@ module _3gpp-common-trace { 
          enum N26 ;

        }

      }

      leaf-list AUSFInterfaces {

      typedef AUSFInterfaces {

        type enumeration {

          enum N12 ;

          enum N13 ;

        }

      }

      leaf-list NEFInterfaces {

      typedef NEFInterfaces {

        type enumeration {

          enum N29 ;

          enum N30 ;

          enum N33 ;

        }

      }

      leaf-list NRFInterfaces {

      typedef NRFInterfaces {

        type enumeration {

          enum N27 ;

        }

      }

      leaf-list NSSFInterfaces {

      typedef NSSFInterfaces {

        type enumeration {

          enum N22 ;

          enum N31 ;

        }

      }

      leaf-list PCFInterfaces {

      typedef PCFInterfaces {

        type enumeration {

          enum N5 ;

          enum N7 ;

          enum N15 ;

        }

      }

      leaf-list SMFInterfaces {

      typedef SMFInterfaces {

        type enumeration {

          enum N4 ;

          enum N7 ;
@@ -450,13 +440,13 @@ module _3gpp-common-trace { 
          enum N16a ;

        }

      }

      leaf-list SMSFInterfaces {

      typedef SMSFInterfaces {

        type enumeration {

          enum N20 ;

          enum N21 ;

        }

      }

      leaf-list UDMInterfaces {

      typedef UDMInterfaces {

        type enumeration {

          enum N8 ;

          enum N10 ;
@@ -464,19 +454,19 @@ module _3gpp-common-trace { 
          enum N21 ;

        }

      }

      leaf-list UPFInterfaces {

      typedef UPFInterfaces {

        type enumeration {

          enum N4 ;

        }

      }

      leaf-list ng-eNBInterfaces {

      typedef ng-eNBInterfaces {

        type enumeration {

          enum NG-C ;

          enum Xn-C ;

          enum Uu ;

        }

      }

      leaf-list gNB-CU-CPInterfaces {

      typedef gNB-CU-CPInterfaces {

        type enumeration {

          enum NG-C ;

          enum Xn-C ;
@@ -486,16 +476,64 @@ module _3gpp-common-trace { 
          enum X2-C ;

        }

      }

      leaf-list gNB-CU-UPInterfaces {

      typedef gNB-CU-UPInterfaces {

        type enumeration {

          enum E1 ;

        }

      }

      leaf-list gNB-DUInterfaces {

      typedef gNB-DUInterfaces {

        type enumeration {

          enum F1-C ;

      }

    }







  leaf-list listOfInterfaces {

      type union {

        type MSCServerInterfaces;

        type MGWInterfaces;

        type RNCInterfaces;

        type SGSNInterfaces;

        type GGSNInterfaces;

        type S-CSCFInterfaces;

        type P-CSCFInterfaces;

        type I-CSCFInterfaces;

        type MRFCInterfaces;

        type MGCFInterfaces;

        type IBCFInterfaces;

        type E-CSCFInterfaces;

        type BGCFInterfaces;

        type ASInterfaces;

        type HSSInterfaces;

        type EIRInterfaces;

        type BM-SCInterfaces;

        type MMEInterfaces;

        type SGWInterfaces;

        type PDN_GWInterfaces;

        type eNBInterfaces;

        type en-gNBInterfaces;

        type AMFInterfaces;

        type AUSFInterfaces;

        type NEFInterfaces;

        type NRFInterfaces;

        type NSSFInterfaces;

        type PCFInterfaces;

        type SMFInterfaces;

        type SMSFInterfaces;

        type UDMInterfaces;

        type UPFInterfaces;

        type ng-eNBInterfaces;

        type gNB-CU-CPInterfaces;

        type gNB-CU-UPInterfaces;

        type gNB-DUInterfaces;

      }

      description "Specifies the interfaces that need to be traced in the given

        ManagedEntityFunction.The attribute is applicable only for Trace. In

        case this attribute is not used, it carries a null semantic.";

      reference "Clause 5.5 of 3GPP TS 32.422 for additional details on the

        allowed values.";



    }



    leaf-list listOfNeTypes {