Commit 6ed74ed2 authored by lengyelb's avatar lengyelb Committed by lengyelb
Browse files

stage 3 updates 1

parent d9aa6f99
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ module _3gpp-common-filemanagement {

  import _3gpp-common-subnetwork { prefix subnet3gpp; }
  import _3gpp-common-top { prefix top3gpp; }
  import _3gpp-common-yang-types { prefix yang3gpp; }
  import _3gpp-common-yang-types { prefix types3gpp; }
  import _3gpp-common-yang-extensions { prefix yext3gpp; }
  import _3gpp-common-managed-element { prefix me3gpp; }
   
@@ -17,13 +17,14 @@ module _3gpp-common-filemanagement {
    TTA, TTC). All rights reserved.";
  reference "3GPP TS 28.623 Generic Network Resource Model (NRM)";

  revision 2023-12-17 { reference CR-0327 ; } 
  revision 2023-09-17 { reference CR-0270 ; } 
  revision 2022-10-31 { reference CR-0195;   }
  revision 2022-02-10 { reference "Initial revision, S5-221757"; }

  grouping FileDownloadProcessMonitor {
    description "Provides specialisations of the ProcessMonitor datatype.";
    uses yang3gpp:ProcessMonitor {
    uses types3gpp:ProcessMonitorGrp {
          refine resultStateInfo {
            description "If status is FAILED resultStateInfo will be one of
                the following or empty.";
+4 −3
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ module _3gpp-common-managed-function {
    3GPP TS 28.620 
    Umbrella Information Model (UIM)";

  revision 2023-12-17 { reference CR-0327 ; } 
  revision 2023-09-17 { reference CR-0270 ; } 
  revision 2022-10-31 { reference CR-0195;   }
  revision 2022-01-07 { reference "CR-0146"; }
@@ -45,7 +46,7 @@ module _3gpp-common-managed-function {
    description "The TraceSubtree shall be contained under ManagedFunction";
  }
  
  grouping Operation {
  grouping OperationGrp {
    description "This data type represents an Operation.";
    reference "3gpp TS 28.622";
    
@@ -101,13 +102,13 @@ module _3gpp-common-managed-function {
      min-elements 1;
      max-elements 1;
      description "The service access point of the managed NF service instance";
      uses types3gpp:SAP;            
      uses types3gpp:SAPGrp;            
    }
 
    list operations {
      key name;
      min-elements 1;
      uses Operation ;
      uses OperationGrp ;
      description "Set of operations supported by the managed NF 
        service instance";
    }
+93 −0
Original line number Diff line number Diff line
module _3gpp-common-management-node {
  yang-version 1.1;  
  namespace urn:3gpp:sa5:_3gpp-common-management-node;
  prefix "mmgmtnode3gpp";
  
  import _3gpp-common-top { prefix top3gpp; }  
  import _3gpp-common-yang-types { prefix types3gpp ; }
  import _3gpp-common-subnetwork { prefix subnet3gpp ; }

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

  description "Defines ManagementNode IOCs
    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
    TTA, TTC). All rights reserved.";
  reference "3GPP TS 28.623
      Generic Network Resource Model (NRM)
      Integration Reference Point (IRP);
      Solution Set (SS) definitions
      
      3GPP TS 28.622
      Generic Network Resource Model (NRM)
      Integration Reference Point (IRP);
      Information Service (IS)
      
      3GPP TS 28.620 
      Umbrella Information Model (UIM)";

  revision 2023-09-18 { reference CR-0271 ; } 
  revision 2023-02-14 { reference "CR-0234"; }

  grouping ManagementSystem_Grp {
    description "Represents the ManagementSystem_ IOC.";

    leaf userLabel {
      type string;
      description "A user-friendly (and user assignable) name of this object.";
    }
    
    leaf-list managedElements {
      type types3gpp:DistinguishedName;
      config false;
      description "Contains a list of the DN(s) of the related subclasses of 
        ManagedElement_ instance(s).";
    }
  }
  
  grouping ManagementNodeGrp {
    uses ManagementSystem_Grp;
    
    leaf vendorName {
      type string;
      config false;
    }
    
    leaf userDefinedState {
      type string;
      description "An operator defined state for operator specific usage";
    }
    
    leaf locationName {
      type string;
      config false;
      description "The physical location of this entity (e.g. an address).";
    }
    
    leaf swVersion {
      type string;
      config false;
    }
  }

  augment /subnet3gpp:SubNetwork {  
    list ManagementNode {
      description "Represents a telecommunications management system (EM) within 
        the TMN that contains functionality for managing a number of 
        ManagedElements (MEs). The management system communicates with the MEs 
        directly or indirectly over one or more interfaces for the purpose 
        of monitoring and/or controlling these MEs.
        
        This class has similar characteristics as the ManagedElement. The 
        main difference between these two classes is that the ManagementNode 
        has a special association to the managed elements that it is 
        responsible for managing.";
      
      key id;   
      uses top3gpp:Top_Grp;
      container attributes {
        uses ManagementNodeGrp;
      }      
    }
  }
}
 No newline at end of file
+58 −28
Original line number Diff line number Diff line
@@ -5,10 +5,10 @@ module _3gpp-common-managementdatacollection {

  import _3gpp-common-top { prefix top3gpp; }
  import _3gpp-common-yang-types {prefix types3gpp; }
  import _3gpp-common-yang-extensions { prefix yext3gpp; }
  //import ietf-inet-types { prefix inet; }
  import ietf-yang-types { prefix yang; }
  import _3gpp-common-subnetwork { prefix subnet3gpp; }
  import _3gpp-common-yang-extensions { prefix yext3gpp; }

  organization "3GPP SA5";
  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -27,6 +27,7 @@ module _3gpp-common-managementdatacollection {
      Integration Reference Point (IRP);
      Information Service (IS)";

  revision 2023-12-17 { reference CR-0327 ; } 
  revision 2023-11-17 { reference "CR-0298"; }
  revision 2023-09-17 { reference CR-0270 ; } 
  revision 2022-11-03 { reference "CR-0193"; }
@@ -44,8 +45,46 @@ module _3gpp-common-managementdatacollection {
    leaf tac { type types3gpp:Tac; }
  }


  grouping NodeFilterGrp {
    description "This data type defines several selection criteria for the 
      target node(s) i.e., the node(s) producing the requested management data. 

      The attribute 'areaOfInterest' determines the location for which the 
      management data is collected. The system translates the area into the 
      target managed objects. The location is either configured by a list of 
      TAI, a list of cells (identified either by NG-RAN CGI, 
      E-UTRAN CGI or UTRAN CGI) or by a geographical area. The geographical 
      area will be mapped to the cells providing coverage for this area. 
      The cell coverage status at the time of the request is used for the 
      mapping.  Managed objects providing service to these cells are 
      considered as target managed objects. Furthermore, an object which name 
      contains or is associated to a managed object providing service to the 
      considered cell, is considered as target managed object as well.

      The attribute 'networkDomain' is used to select a particular domain 
      (e.g. RAN, CN) for which the management data is collected. The system 
      translates this information into the target managed objects. Managed 
      objects from this selected particular domain (e.g RAN, CN) are 
      considered as target managed objects. Furthermore, an object which name 
      contains or is associated to a managed object of that domain, is 
      considered as target managed object as well. 

      The attribute 'cpUpType' is used to select the traffic type (CP, UP) for 
      which the management data is collected. The system translates this 
      information into the target managed objects. Managed objects catering 
      particular traffic type (CP, UP) are considered as target managed objects. 
      Furthermore, an object which name contains or is associated to a managed 
      object of that traffic type, shall be considered as target managed 
      object as well.

      The attribute 'sst' is used to select the SST (Slice/Service Type)
      for which the management data is collected. The system translates this 
      information into the target managed objects. Managed objects related to 
      particular SST will be considered as target managed objects. 

      If it is not possible to select the target node(s) (based on a 
      particular selection criteria) deterministically, the selection criteria 
      should not be used.";

    list areaOfInterest {
      key idx;
@@ -53,8 +92,6 @@ module _3gpp-common-managementdatacollection {
        type string;
      }
      uses Tai;          // (Maybe type: types3gpp:Tai,if we define Tai there.)
      // mandatory false
      min-elements 1;
      description "It specifies a location(s) from where the management data
        shall be collected. It is defined in terms of TAI(s).";
    }
@@ -64,7 +101,6 @@ module _3gpp-common-managementdatacollection {
        enum CN;
        enum RAN;
      }
      // mandatory false
      description "It specifies the network domain of the target node. This
        will also result in collecting appropriate management data from the
        nodes belonging to the specified domain.";
@@ -75,7 +111,6 @@ module _3gpp-common-managementdatacollection {
        enum CP;
        enum UP;
      }
      // mandatory false
     description "It specifies the traffic type of the target node. This will
       also result in collecting appropriate management data from the nodes
       handling the specified traffic (e.g AMF for CP and UPF for UP).";
@@ -83,7 +118,6 @@ module _3gpp-common-managementdatacollection {

    leaf sst {
      type uint8;  // TS 28.003 clause 28.4.
      //mandatory false;
      description "It specifies the slice service type (SST) of which the slice
        subnet should be targeted. Please refer to 3GPP TS 23.501: 'System
        Architecture for the 5G System'";
@@ -112,15 +146,13 @@ module _3gpp-common-managementdatacollection {
    }
  }


  grouping ManagementDataCollectionGrp {

    choice managementData {
      case mgtDataCategory {
        leaf-list category  {
        leaf-list mgtDataCategory  {
          type mgtDataCategoryType;
          min-elements 1;
          max-elements 5; // The ENUM contains 5 possible values
          yext3gpp:inVariant;
          description "This attributes defines the type of management data that
            are requested.

@@ -149,9 +181,9 @@ module _3gpp-common-managementdatacollection {
        }
      }
      case mgtDataName {
        leaf-list name {
        leaf-list mgtDataName {
          type string;
          min-elements 1;
          yext3gpp:inVariant;
          description "A list of management data identified by name.
            The list may include metrics or set of metrics defined
            in TS 28.552, TS 28.554 and TS 32.422.
@@ -170,10 +202,7 @@ module _3gpp-common-managementdatacollection {
            For trace metrics (including trace messages, MDT measurements
            (Immediate MDT, Logged MDT, Logged MBSFN MDT), RLF and RCEF
            reports) defined in TS 32.422, the name (metric identifier) is
            defined in clause 10 of TS 32.422.
            
            For non-3GPP specified management data the name is defined
            elsewhere.";
            defined in clause 10 of TS 32.422.";
          }
      }
      mandatory true;
@@ -181,10 +210,10 @@ module _3gpp-common-managementdatacollection {

    list targetNodeFilter {
      key idx;
      yext3gpp:inVariant;
      leaf idx {
        type string;
      }
      min-elements 1;
      description "Set of information to target the Object Instance to collect
        the measurements from.";
      uses NodeFilterGrp;
@@ -192,6 +221,7 @@ module _3gpp-common-managementdatacollection {

    list collectionTimeWindow {
        key "startTime endTime";
        yext3gpp:inVariant;
        max-elements 1;
        description "Collection time window for which the management data
          should be reported.";
@@ -200,6 +230,7 @@ module _3gpp-common-managementdatacollection {

    list reportingCtrl {
      key idx;
      yext3gpp:inVariant;
      leaf idx {
        type string;
      }
@@ -211,18 +242,17 @@ module _3gpp-common-managementdatacollection {
    }

    leaf dataScope {
      yext3gpp:inVariant;
      type enumeration {
        enum SNSSAI;
        enum 5QI;
      }
        // mandatory false; [Implicit]
      description "It specifies whether the required data is reported per
        S-NSSAI or per 5QI.";
    }
  }

  augment /subnet3gpp:SubNetwork {

    list ManagementDataCollection {
      key id;
      uses top3gpp:Top_Grp ;
@@ -245,8 +275,8 @@ module _3gpp-common-managementdatacollection {
        producing the required management data. In this case consumer can
        request management data, specified by 3GPP, produced by certain network
        function(s) based on a particular location, the domain (CN or RAN) of
        the network function, and the handled traffic (CP or UP) of the network
        function.
        the object instances, and the handled traffic (CP or UP) of the object 
        instances.

        To activate the production of the requested data, a MnS consumer has to
        create a 'ManagementDataCollection' object instance on the MnS producer.
+17 −9
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ module _3gpp-common-measurements {
      Integration Reference Point (IRP);
      Information Service (IS)";

  revision 2024-01-29 { reference "CR-0327"; }
  revision 2023-11-17 { reference "CR-0298"; }
  revision 2023-11-05 { reference CR-0306 ; } 
  revision 2023-09-17 { reference CR-0270 ; } 
@@ -518,7 +519,6 @@ module _3gpp-common-measurements {
      The value is a multiple of a supported granularity period for the 
      measurements being monitored.

      Each threshold is identified with a number (key) called thresholdLevel.
      A threshold is defined using the attributes thresholdValue ,
      thresholdDirection and hysteresis.

@@ -533,11 +533,10 @@ module _3gpp-common-measurements {
      threshold is triggered when the low threshold value is reached or crossed.
      The hsyteresis ensures that the performance metric value can oscillate
      around a comparison value without triggering each time the threshold when
      the threshold value is crossed.

      Using the thresholdDirection attribute a threshold can be configured in
      such a manner that it is triggered only when the monitored performance
      metric is going up or down upon reaching or crossing the threshold.
      the threshold value is crossed. Using the thresholdDirection attribute a 
      threshold can be configured in such a manner that it is triggered only 
      when the monitored performance metric is going up or down upon reaching 
      or crossing the threshold.

      A ThresholdMonitor creation request shall be rejected, if the performance
      metrics requested to be monitored, the requested granularity period, or
@@ -547,7 +546,16 @@ module _3gpp-common-measurements {

      Creation and deletion of ThresholdMonitor instances by MnS consumers is
      optional; when not supported, ThresholdMonitor instances may be created
      and deleted by the system or be pre-installed.";
      and deleted by the system or be pre-installed.
      
      A threshold crossing event detected by a 'ThresholdMonitor' shall 
      trigger a 'notifyThresholdCrossing' notification. To subscribe to 
      'notifyThresholdCrossing' notifications the MnS consumer shall specify 
      one or more 'ThresholdMonitor' instances in the subscription. All 
      threshold crossings detected by the specified 'ThresholdMonitor' 
      instances are sent as 'notifyThresholdCrossing' to subscribed MnS 
      consumers (unless filtered out by the 'notificationFilter' attribute 
      of 'NtfSubscriptionControl').";


      uses top3gpp:Top_Grp ;
Loading