Commit 9de71c55 authored by lengyelb's avatar lengyelb
Browse files

YANG corrections to stm and containing classes

parent 931706e2
Loading
Loading
Loading
Loading
Loading
+23 −25
Original line number Diff line number Diff line
@@ -18,15 +18,18 @@ module _3gpp-5gc-nrm-stmfunction {
  
  revision 2024-11-07 { reference "S5-247077"; } 
  
  grouping STMFunctionGrp {
    leaf stmTargetUri {
      type inet:uri;
      description "It specifies the Uniform Resource Identifier (URI) of the STM
        consumer that shall receive the monitored signalling message copies ";
      reference "Clause 4.4 of 3GPP TS 32.158";
  grouping StmCtrlGrp {
    description "Represents the StmCtrl IOC.";

    leaf-list reportingNFList {
      type types3gpp:DistinguishedName;
      description "List of Network Function Distinguished Name, which 
        specifies the target network interface type to be monitored. If 
        this parameter is not present or it is empty, then all applicable 
        interface types from the target NF shall be monitored";   
    }
    
    leaf-list networkInterfaceType {
    leaf-list networkInterfaceTypeList {
      type enumeration {
        enum ALL;
        enum N4;
@@ -45,6 +48,7 @@ module _3gpp-5gc-nrm-stmfunction {
        enum N80;
        enum N81;
      }
      default ALL;
      description "List of network interface type. it specifies the network 
        function whose signalling traffic is to be monitored. If this 
        parameter is not present or it is empty, then all Network Functions 
@@ -55,16 +59,16 @@ module _3gpp-5gc-nrm-stmfunction {
        allowed values.";
    }

    leaf-list reportingNF {
      type types3gpp:DistinguishedName;
      description "List of Network Function Distinguished Name, which 
        specifies the target network interface type to be monitored. If 
        this parameter is not present or it is empty, then all applicable 
        interface types from the target NF shall be monitored";   
    leaf stmTargetUri {
      type inet:uri;
      mandatory true;
      description "It specifies the Uniform Resource Identifier (URI) of the STM
        consumer that shall receive the monitored signalling message copies ";
      reference "Clause 4.4 of 3GPP TS 32.158";
    }
    
    leaf administrativeState {
      default UNLOCKED;
      default LOCKED;
      type types3gpp:BasicAdministrativeState ;
      description "It is used by the STM consumer to lock or unlock the 
        StmCtrl instance in order to stop or start the signalling traffic 
@@ -79,15 +83,9 @@ module _3gpp-5gc-nrm-stmfunction {
    }
  }

  grouping STMFunctionSubTreee {
    description "Contains classes that manage Tracing.
      Should be used in all  classes (or classes inheriting from)
      - SubNnetwork
      - ManagedElement
      - ManagedFunction

      If a YANG module wants to augment these classes/list/groupings they must
      augment all user classes!";
  grouping StmCtrlSubTree {
    description "Contains classes that manage Signalling traffic monitoring 
      management";

    list StmCtrl  {
      description "This IOC represents the STM Control and Configuration 
@@ -97,7 +95,7 @@ module _3gpp-5gc-nrm-stmfunction {
      key id;
      uses top3gpp:Top_Grp ;
      container attributes {
        uses STMFunctionGrp ;
        uses StmCtrlGrp ;
      }
      
    }
+10 −1
Original line number Diff line number Diff line
@@ -13,6 +13,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; }

  organization "3GPP SA5";
  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -34,6 +35,7 @@ module _3gpp-common-managed-element {
      3GPP TS 28.620 
      Umbrella Information Model (UIM)";
      
  revision 2024-11-19 { reference "Add STM"; } 
  revision 2024-10-01 { reference "CR-0437,CR-0438" ; } 
  revision 2024-01-30 { reference CR-0328 ; } 
  revision 2023-11-14 { reference CR-0305 ; }
@@ -126,6 +128,10 @@ module _3gpp-common-managed-element {
      ManagedElement.";
  }  

  feature StmCtrlUnderManagedElement {
    description "The StmCtrlSubtree shall be contained under ManagedElement";
  }  
  
  grouping ManagedElement_Grp {
    description "Abstract class representing telecommunications resources.
      An ME communicates with a manager (directly or indirectly) for the 
@@ -315,5 +321,8 @@ module _3gpp-common-managed-element {
      if-feature ECMappingRuleUnderManagedElement;
    }
    
    uses stm3gpp:StmCtrlSubTree {
      if-feature StmCtrlUnderManagedElement ;
    }
  }    
}
+10 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 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; }
  
  organization "3GPP SA5";
  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -24,6 +25,7 @@ module _3gpp-common-managed-function {
    3GPP TS 28.620 
    Umbrella Information Model (UIM)";

  revision 2024-11-19 { reference "Add STM"; } 
  revision 2024-02-24 { reference CR-0346; } 
  revision 2023-09-18 { reference CR-0271; } 
  revision 2023-04-26 { reference CR-0250; }
@@ -49,6 +51,10 @@ module _3gpp-common-managed-function {
    description "The TraceSubtree shall be contained under ManagedFunction";
  }

  feature StmCtrlUnderManagedFunction {
    description "The StmCtrlSubtree shall be contained under ManagedFunction";
  }  
  
  grouping OperationGrp {
    description "This data type represents an operation.";
    reference "3gpp TS 28.622";
@@ -351,5 +357,9 @@ module _3gpp-common-managed-function {
    uses trace3gpp:TraceSubtree {
      if-feature TraceUnderManagedFunction ;
    }
    
    uses stm3gpp:StmCtrlSubTree {
      if-feature StmCtrlUnderManagedFunction ;
    }
  }
}
 No newline at end of file
+9 −1
Original line number Diff line number Diff line
@@ -14,6 +14,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; }

  organization "3GPP SA5";
  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -34,6 +35,7 @@ module _3gpp-common-subnetwork {
      3GPP TS 28.620 
      Umbrella Information Model (UIM)";
  
  revision 2024-11-19 { reference "Add STM"; } 
  revision 2024-01-30 { reference CR-1337 ; } 
  revision 2024-01-30 { reference CR-0328 ; } 
  revision 2023-11-14 { reference CR-0305 ; } 
@@ -142,6 +144,10 @@ module _3gpp-common-subnetwork {
      feature. The CESManagementFunction shall be contained under SubNetwork.";
  }

  feature StmCtrlUnderManagedSubNetwork {
    description "The StmCtrlSubtree shall be contained under SubNetwork";
  }  
  
  grouping Domain_Grp {
    description "A domain is a partition of instances of managed entities 
      such that : 
@@ -274,12 +280,14 @@ module _3gpp-common-subnetwork {
      if-feature EcmConnectionInfoUnderSubNetwork;
    }

    uses stm3gpp:StmCtrlSubTree {
      if-feature StmCtrlUnderManagedSubNetwork ;
    }    

    yangmnt:mount-point children-of-SubNetwork {
      description "Mountpoint for ManagedElement";
      reference "RFC8528 YANG Schema Mount";
    }
    
    // augment external parts here
  }
}