Commit 162076fe authored by Mirko Cano Soveri's avatar Mirko Cano Soveri
Browse files

Merge branch 'balazs-r16-140' into 'Rel-16'

YANG Merge after SA5#140e and SA#94-e - Balazs

See merge request sa5/MnS!232
parents 789653ab 2d4ccda6
Loading
Loading
Loading
Loading
+155 −35
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ module _3gpp-common-trace {
      Integration Reference Point (IRP);
      Information Service (IS)";

  revision 2021-10-18 { reference "CR-0139"; }
  revision 2021-07-22 { reference "CR-0137"; }
  revision 2021-01-25 { reference "CR-0122"; }
  revision 2020-11-16 { reference "CR-0117"; }
@@ -616,6 +617,33 @@ module _3gpp-common-trace {
      reference "Clause 5.10.20 of 3GPP TS 32.422";
    }

    leaf tjMDTCollectionPeriodM6Lte {
      when './tjJobType = "IMMEDIATE_MDT_ONLY"' 
        +  ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
      type uint32 {
        range "1024|2048|5120|10240";
      }
      units milliseconds;
      description "Specifies the collection period for the Packet Delay 
        measurement (M6) for MDT taken by the eNB. The attribute is applicable 
        only for Immediate MDT. In case this attribute is not used, 
        it carries a null semantic.";
      reference "Clause 5.10.32 of  TS 32.422 ";
    }
    
    leaf tjMDTCollectionPeriodM7Lte {
      when './tjJobType = "IMMEDIATE_MDT_ONLY"' 
        +  ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
      type uint16 {
        range 1..60 ;
      }
      description "It specifies the collection period for the Data Volume (M6) 
        and Throughput measurements (M7) for UMTS MDT taken by RNC. The 
        attribute is applicable only for Immediate MDT. In case this attribute 
        is not used, it carries a null semantic.";
      reference "Clause 5.10.22 of  TS 32.422 .";
    }
    
    leaf tjMDTCollectionPeriodRrmUmts {
      when './tjJobType = "IMMEDIATE_MDT_ONLY"'
        +  ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
@@ -645,6 +673,45 @@ module _3gpp-common-trace {
      reference "Clause 5.10.30 of 3GPP TS 32.422";
    }

    leaf tjMDTCollectionPeriodM6NR {
      when './tjJobType = "IMMEDIATE_MDT_ONLY"'
        + ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
      type enumeration {
        enum 120ms;
        enum 240ms;
        enum 480ms;
        enum 640ms;
        enum 1024ms;
        enum 2048ms;
        enum 5120ms;
        enum 10240ms;
        enum 20480ms;
        enum 40960ms;
        enum 1min;
        enum 6min;
        enum 12min;
        enum 30min;
      }
      description "It specifies the collection period for the Packet Delay 
        measurement (M6) for NR MDT taken by the gNB. The attribute is 
        applicable only for Immediate MDT. In case this attribute is not used, 
        it carries a null semantic.";
      reference "clause 5.10.34 of  TS 32.422";
    }
    
    leaf tjMDTCollectionPeriodM7NR {
      when './tjJobType = "IMMEDIATE_MDT_ONLY"'
        + ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
      type uint32 {
        range "1..60";
      }
      description "It specifies the collection period for the Packet Loss Rate 
        measurement (M7) for NR MDT taken by the gNB. The attribute is 
        applicable only for Immediate MDT. In case this attribute is not used, 
        it carries a null semantic.";    
      reference "clause 5.10.35 of  TS 32.422";
    }
    
    leaf tjMDTEventListForTriggeredMeasurement {
      when './tjJobType = "LOGGED_MDT_ONLY"';
      type enumeration {
@@ -709,6 +776,46 @@ module _3gpp-common-trace {
      reference "5.10.8 of 3GPP TS 32.422";
    }

    leaf tjMDTLoggingEventThreshold {
      when './tjJobType = "LOGGED_MDT_ONLY" or ./tjJobType = "LOGGED_MBSFN_MDT"';
      type uint32 {
        range "0..127";
      }
      description "It specifies the threshold which should trigger 
        the reporting in case of event based reporting of logged NR MDT. 
        The attribute is applicable only for Logged MDT and when tjMDTReportType 
        is configured for event triggered reporting and when 
        tjMDTEventListForTriggeredMeasurement is configured for L1 event. 
        In case this attribute is not used, it carries a null semantic.";
      reference "clause 5.10.36 of TS 32.422";
    }
    
    leaf tjMDTLoggedHysteresis {
      when './tjJobType = "LOGGED_MDT_ONLY" or ./tjJobType = "LOGGED_MBSFN_MDT"';
      type uint32 {
        range "0..30";
      }
      description "It specifies the hysteresis used within the entry and leave 
        condition of the L1 event based reporting of logged NR MDT. 
        The attribute is applicable only for Logged MDT, when tjMDTReportType 
        is configured for event triggered reporting and when 
        tjMDTEventListForTriggeredMeasurement is configured for L1 event. 
        In case this attribute is not used, it carries a null semantic.";
      reference "clause 5.10.37 of TS 32.422";
    }
    
    leaf tjMDTLoggedTimeToTrigger {
      when './tjJobType = "LOGGED_MDT_ONLY" or ./tjJobType = "LOGGED_MBSFN_MDT"';
      type int32 ;
      description "It specifies the threshold which should trigger 
        the reporting in case of event based reporting of logged NR MDT. 
        The attribute is applicable only for Logged MDT, when tjMDTReportType 
        is configured for event triggered reporting and when 
        tjMDTEventListForTriggeredMeasurement is configured for L1 event. 
        In case this attribute is not used, it carries a null semantic.";
      reference "clauses 5.10.38 of TS 32.422";
    }
    
    leaf-list tjMDTMBSFNAreaList {
      when './tjJobType = "LOGGED_MBSFN_MDT"';
      type string;
@@ -762,6 +869,19 @@ module _3gpp-common-trace {
      reference "Clause 5.10.15 of 3GPP TS 32.422";
    }

    leaf tjMDTM4ThresholdUmts {
      when './tjJobType = "IMMEDIATE_MDT_ONLY"' 
        +  ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
      type uint16 {
        range 0..31 ;
      }        
      description "It specifies the threshold which should trigger 
        the reporting in case of event-triggered periodic reporting for M4 
        (UE power headroom measurement) in UMTS. In case this attribute is 
        not used, it carries a null semantic.";
        reference "3GPP TS 32.422 clause 5.10.A";
    }
    
    list tjMDTPLMList {
      when './tjJobType = "LOGGED_MDT_ONLY"';
      key "mcc mnc";
+11 −1
Original line number Diff line number Diff line
@@ -11,8 +11,9 @@ module _3gpp-common-yang-types {
  description "The model defines a YANG mapping of the top level 
    information classes used for management of 5G networks and 
    network slicing.";
  reference "3GPP TS 28.541";
  reference "3GPP TS 28.623";

  revision 2021-11-01 { reference "CR-0141"; }
  revision 2020-11-06 {
    description "Removed incorrect S-NSSAI definitions.";
    reference "CR-0118";
@@ -37,6 +38,15 @@ module _3gpp-common-yang-types {
    reference  "Initial version.";
  }

  typedef EnabledDisabled {
    type enumeration {
      enum DISABLED ;
      enum ENABLED ;
    }
  }
  
  // grouping ManagedNFProfile will be removed as it is 
  //  being moved to _3gpp-5gc-nrm-nfprofile
  grouping ManagedNFProfile {
    description "Defines profile for managed NF";
    reference "3GPP TS 23.501";