Commit 688a555e authored by lengyelb's avatar lengyelb
Browse files

Merge branch 'Stm_Rel19-yang' into 'Integration_Rel19_SA5_158_YANG'

Stm_Rel19-yang into Integration

See merge request !1524
parents 82601f94 9de71c55
Loading
Loading
Loading
Loading
Loading
+103 −0
Original line number Diff line number Diff line
module _3gpp-5gc-nrm-stmfunction {
  yang-version 1.1;
  
  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-stmfunction;
  prefix stm3gpp;
  
  import _3gpp-common-top { prefix top3gpp; }
  import ietf-inet-types { prefix inet; }
  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 STM function defined in 3GPP TS 28.abc.
    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
    TTA, TTC). All rights reserved.";
  reference "3GPP TS 28.abc
    Signalling traffic monitoring management";
  
  revision 2024-11-07 { reference "S5-247077"; } 
  
  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 networkInterfaceTypeList {
      type enumeration {
        enum ALL;
        enum N4;
        enum N5;
        enum N7;
        enum N8;
        enum N10;
        enum N11;
        enum N12;
        enum N13;
        enum N14;
        enum N15;
        enum N22;
        enum N58;
        enum N59;
        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 
        within the SubNetwork or ManagedElement shall be monitored. This 
        parameter shall be omitted if the STM control object is specified 
        under a ManagedFunction. ";
      reference "Clause 4.2.3 of 3GPP TS 23.501 for details on the
        allowed values.";
    }

    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 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 
        monitoring";
    }

    leaf operationalState {
      config false;
      mandatory true;
      type types3gpp:OperationalState ;
      description "It is used by STM consumer to report its working state";
    }
  }

  grouping StmCtrlSubTree {
    description "Contains classes that manage Signalling traffic monitoring 
      management";

    list StmCtrl  {
      description "This IOC represents the STM Control and Configuration 
        parameters of a particular STM controlling. It can be 
        name-contained by SubNetwork, ManagedElement, or ManagedFunction.";

      key id;
      uses top3gpp:Top_Grp ;
      container attributes {
        uses StmCtrlGrp ;
      }
      
    }
  }
}
 No newline at end of file
+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
  }
}