Commit 54248275 authored by lengyelb's avatar lengyelb
Browse files

Locally rebased and merged !1704

parent 2e28b52a

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

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ module _3gpp-common-managed-element { 
  import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; }

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

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

  import _3gpp-5gc-nrm-stmfunction { prefix stm3gpp; }

  import _3gpp-stm-nrm-stmfunction { prefix stm3gpp; }

  import _3gpp-nr-nrm-mwab { prefix mwab3gpp; }



  organization "3GPP SA5";
@@ -37,7 +37,7 @@ module _3gpp-common-managed-element { 
      3GPP TS 28.620 

      Umbrella Information Model (UIM)";

      

  revision 2025-04-25 { reference CR-1527 ; } 

  revision 2025-04-25 { reference "CR-0532 CR0541" ; } 

  revision 2025-03-25 { reference "CR-0516"; } 

  revision 2024-10-01 { reference "CR-0437,CR-0438" ; } 

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

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

+3 −2
Original line number Diff line number Diff line
@@ -8,13 +8,13 @@ module _3gpp-common-managed-function { 
  import _3gpp-common-top { prefix top3gpp; }

  import _3gpp-common-measurements { prefix meas3gpp; }

  import _3gpp-common-trace { prefix trace3gpp; }

  import _3gpp-5gc-nrm-stmfunction { prefix stm3gpp; }

  import _3gpp-stm-nrm-stmfunction { prefix stm3gpp; }

  

  organization "3GPP SA5";

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

  description "The module defines a base class/grouping for major 3GPP 

    functions.

    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.622
@@ -25,6 +25,7 @@ module _3gpp-common-managed-function { 
    3GPP TS 28.620 

    Umbrella Information Model (UIM)";



  revision 2025-04-19 { reference "CR-0541"; } 

  revision 2024-11-19 { reference "Add STM"; } 

  revision 2024-02-24 { reference CR-0346; } 

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

yang-models/_3gpp-common-subnetwork.yang

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ module _3gpp-common-subnetwork { 
  import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; }

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

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

  import _3gpp-5gc-nrm-stmfunction { prefix stm3gpp; }

  import _3gpp-stm-nrm-stmfunction { prefix stm3gpp; }

  import _3gpp-nr-nrm-mwab { prefix mwab3gpp; }



  organization "3GPP SA5";
@@ -37,7 +37,7 @@ module _3gpp-common-subnetwork { 
      3GPP TS 28.620 

      Umbrella Information Model (UIM)";

  

  revision 2025-04-25 { reference CR-1527 ; } 

  revision 2025-04-25 { reference "CR-0532 CR0541" ; } 

  revision 2025-03-25 { reference "CR-0516 CR-0527"; } 

  revision 2024-11-19 { reference "Add STM"; } 

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

yang-models/_3gpp-5gc-nrm-stmfunction.yang→yang-models/_3gpp-stm-nrm-stmfunction.yang

+3 −3
Original line number Diff line number Diff line 
module _3gpp-5gc-nrm-stmfunction {

module _3gpp-stm-nrm-stmfunction {

  yang-version 1.1;

  

  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-stmfunction;

  namespace urn:3gpp:sa5:_3gpp-stm-nrm-stmfunction;

  prefix stm3gpp;

  

  import _3gpp-common-top { prefix top3gpp; }
@@ -17,6 +17,7 @@ module _3gpp-5gc-nrm-stmfunction { 
    Signalling traffic monitoring management";

  

  revision 2025-05-07 { reference "CR-0009"; } 

  revision 2025-04-19 { reference "CR-0010"; } 

  revision 2024-11-07 { reference "S5-247077"; } 

  

  grouping NetworkInterfaceGrp {
@@ -93,7 +94,6 @@ module _3gpp-5gc-nrm-stmfunction { 
        enum NL8;

        enum NL9;

      }

      default ALL;

      description "List of network interface type to be monitored. The 

        applicable network interface type names are specified based on 

        subclause 4.2.3 of 3GPP TS 23.501 and clause 4.2.1 of 3GPP