Commit b7f8e7da authored by lengyelb's avatar lengyelb
Browse files

Merge branch '28.623_Rel16_CR_0130_Correction_of_YANG_Solution_set' into...

Merge branch '28.623_Rel16_CR_0130_Correction_of_YANG_Solution_set' into 'Integration_Rel16_SA5_138_YANG'

28.623 rel16 cr 0130 correction of yang solution set

See merge request sa5/MnS!195
parents 83e0b97f e52314ca
Loading
Loading
Loading
Loading
+269 −247
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ module _3gpp-common-measurements {
      Integration Reference Point (IRP);
      Information Service (IS)";

  revision 2021-07-22 { reference "CR-0137"; }
  revision 2020-11-06 { reference "CR-0118"; }
  revision 2020-09-04 { reference "CR-000107"; }
  revision 2020-06-08 { reference "CR-0092"; }
@@ -60,7 +61,7 @@ module _3gpp-common-measurements {
  revision 2020-03-11 { reference "S5-201581, SP-200229"; }
  revision 2019-11-21 { reference "S5-197275, S5-197735"; }
  revision 2019-10-28 { reference "S5-193516"; }
  revision 2019-06-17 { }
  revision 2019-06-17 { reference " "; }

  grouping ThresholdInfoGrp {
    description "Defines a single threshold level.";
@@ -167,9 +168,8 @@ module _3gpp-common-measurements {
        min-elements 1;
        description "Performance metrics include measurements defined in
          TS 28.552 and KPIs defined in TS 28.554. Performance metrics can
          also be those specified by other SDOs or vendor specific metrics. 
          Performance metrics are identfied with their names. A name can also 
          identify a vendor specific group of performance metrics.
          also be specified by other SDOs or be vendor specific.
          Performance metrics are identfied with their names.

          For measurements defined in TS 28.552 the name is constructed as
          follows:
@@ -179,7 +179,10 @@ module _3gpp-common-measurements {
          - 'family' for measurement families

          For KPIs defined in TS 28.554 the name is defined in the KPI
          definitions template as the component designated with e).";
          definitions template as the component designated with e).

          A name can also identify a vendor specific performance metric or a
          group of vendor specific performance metrics.";
      }

      leaf-list granularityPeriods {
@@ -396,8 +399,7 @@ module _3gpp-common-measurements {
        can be name-contained by SubNetwork, ManagedElement, or ManagedFunction.

        To activate the production of the specified performance metrics, a MnS
        consumer needs to create a PerfMetricJob instance on the MnS producer 
        and ensure that the adminState is sUNLOCKED>. 
        consumer needs to create a PerfMetricJob instance on the MnS producer.
        For ultimate deactivation of metric production, the MnS consumer should
        delete the job to free up resources on the MnS producer.

@@ -406,7 +408,7 @@ module _3gpp-common-measurements {
        producer may disable metric production as well, for example in overload
        situations. This situation is indicated by the MnS producer with setting
        the operational state attribute to disabled. When production is resumed
        the operational state is set again to enabled.
        the operational state is set back to enabled.

        The jobId attribute can be used to associate metrics from multiple
        PerfMetricJob instances. The jobId can be included when reporting
@@ -446,6 +448,26 @@ module _3gpp-common-measurements {
        file location by the MnS producer, file-based reporting with selection
        of the file location by the MnS consumer and stream-based reporting.

        For file-based reporting, all performance metrics that are produced
        related to a 'PerfMetricJob' instance for a reporting period shall be
        stored in a single reporting file.

        When the administrative state is set to 'UNLOCKED' after the creation
        of a 'PerfMetricJob' the first granularity period shall start. When
        the administrative state is set to 'LOCKED' or the operational state
        to 'DISABLED', the ongoing reporting period shall be aborted, for
        streaming the ongoing granularity period. When the administrative
        state is set back to 'UNLOCKED' or the operational state to 'ENABLED'
        a new reporting period period shall start, in case of streaming a new
        granularity period.

        Changes of all other configurable attributes shall take effect only at
        the beginning of the next reporting period, for streaming at the
        beginning of the next granularity period.

        When the 'PerfMetricJob' is deleted, the ongoing reporting period shall
        be aborted, for streaming the ongoing granularity period.

        A PerfMetricJob creation request shall fail, when the requested
        performance metrics, the requested granularity period, the requested
        repoting method, or the requested combination thereof is not supported
+295 −191
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-07-22 { reference "CR-0137"; }
  revision 2021-01-25 { reference "CR-0122"; }
  revision 2020-11-16 { reference "CR-0117"; }
  revision 2020-08-06 { reference "CR-0102"; }
@@ -59,7 +60,8 @@ module _3gpp-common-trace {
        +'+count(NEFInterfaces)+count(NRFInterfaces)+count(NSSFInterfaces)'
        +'+count(PCFInterfaces)+count(SMFInterfaces)+count(SMSFInterfaces)'
        +'+count(UDMInterfaces)+count(UPFInterfaces)+count(ng-eNBInterfaces)'
        +'+count(gNB-CU-CPInterfaces)+count(gNB-CU-UPInterfaces)+count(gNB-DUInterfaces)';
        +'+count(gNB-CU-CPInterfaces)+count(gNB-CU-UPInterfaces)'
        +'+count(gNB-DUInterfaces)';

      description "Specifies the interfaces that need to be traced in the given
        ManagedEntityFunction.The attribute is applicable only for Trace. In
@@ -419,7 +421,8 @@ module _3gpp-common-trace {
    }

    leaf tjTraceDepth {
      when './tjJobType = "TRACE_ONLY" or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
      when './tjJobType = "TRACE_ONLY"'
        +  ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
      type enumeration  {
        enum MINIMUM;
        enum MEDIUM;
@@ -448,6 +451,15 @@ module _3gpp-common-trace {
        The attribute is applicable for both Trace and MDT.";
    }

    leaf tjTraceRecordSessionReference {
      type string;
      mandatory true;
      description "An identifier, which identifies the Trace Recording Session. 
        The attribute is applicable for both Trace and MDT.
        See the clause 5.7 of 3GPP TS 32.422 for additional details on the 
        allowed values.";
    }
    
    leaf tjTraceReportingFormat {
      type enumeration {
        enum FILE_BASED;
@@ -505,22 +517,24 @@ module _3gpp-common-trace {
        The tjTraceTarget shall be IMSI if the Trace Session is activated to a
        ManagedEntity playing a role of ServinGWFunction.

        In case of signaling based Trace/MDT, the tjTraceTarget attribute shall be 
        able to carry (IMSI or IMEI(SV)or SUPI), the tjMDTAreaScope attribute shall be 
        able to carry a list of (cell or E-UtranCell or NRCellDU or TA/LA/RA).
        In case of signaling based Trace/MDT, the tjTraceTarget attribute shall 
        be able to carry (IMSI or IMEI(SV)or SUPI), the tjMDTAreaScope attribute 
        shall be able to carry a list of (cell or E-UtranCell or NRCellDU or 
        TA/LA/RA).

        In case of management based Immediate MDT, the tjTraceTarget attribute
        shall be null value, the tjMDTAreaScope attribute shall carry a list of
        (Utrancell or E-UtranCell or NRCellDU).

        In case of management based Logged MDT, the tjTraceTarget attribute
        shall carry an eBs or a RNC or gNBs. The Logged MDT should be initiated on 
        the specified eNB or RNC or gNB in tjTraceTarget. The tjMDTAreaScope attribute 
        shall carry a list of (Utrancell or E-UtranCell or NRCellDU or TA/LA/RA).

        In case of RLF reporting, or RCEF reporting,  the tjTraceTarget attribute 
        shall be null value, the tjMDTAreaScope attribute shall carry one or 
        list of eNBs/gNBs";  
        shall carry an eBs or a RNC or gNBs. The Logged MDT should be initiated 
        on the specified eNB or RNC or gNB in tjTraceTarget. The tjMDTAreaScope 
        attribute shall carry a list of (Utrancell or E-UtranCell or NRCellDU or 
        TA/LA/RA).

        In case of RLF reporting, or RCEF reporting,  the tjTraceTarget 
        attribute shall be null value, the tjMDTAreaScope attribute shall carry 
        one or list of eNBs/gNBs";
      reference "3GPP TS 32.422";
    }

@@ -588,7 +602,8 @@ module _3gpp-common-trace {
    }

    leaf tjMDTCollectionPeriodRrmLte {
      when './tjJobType = "IMMEDIATE_MDT_ONLY" or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
      when './tjJobType = "IMMEDIATE_MDT_ONLY"' 
        +  ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
      type uint32 {
        range "250|500|1000|2000|3000|4000|6000|8000|12000|16000|20000|"
          +"24000|28000|32000|64000";
@@ -602,7 +617,8 @@ module _3gpp-common-trace {
    }

    leaf tjMDTCollectionPeriodRrmUmts {
      when './tjJobType = "IMMEDIATE_MDT_ONLY" or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
      when './tjJobType = "IMMEDIATE_MDT_ONLY"'
        +  ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
      type uint32 {
        range "1024|1280|2048|2560|5120|"
          +"10240|60000";
@@ -616,15 +632,16 @@ module _3gpp-common-trace {
    }

      leaf tjMDTCollectionPeriodRrmNR {
        when './tjJobType = "IMMEDIATE_MDT_ONLY" or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
        when './tjJobType = "IMMEDIATE_MDT_ONLY"'
          + ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
        type uint32 {
          range "1024|2048|5120|10240|60000";
        }
        units milliseconds;
        description "Specifies the collection period for collecting RRM configured 
          measurement samples for M4, M5 in NR. The attribute is applicable only 
          for Immediate MDT. In case this attribute is not used, it carries a 
          null semantic.";
        description "Specifies the collection period for collecting RRM 
          configured measurement samples for M4, M5 in NR. The attribute is 
          applicable only for Immediate MDT. In case this attribute is not 
          used, it carries a null semantic.";
        reference "Clause 5.10.30 of 3GPP TS 32.422";
      }

@@ -704,7 +721,8 @@ module _3gpp-common-trace {
    }

    leaf tjMDTMeasurementPeriodLTE {
          when './tjJobType = "IMMEDIATE_MDT_ONLY" or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
          when './tjJobType = "IMMEDIATE_MDT_ONLY"'
            +  ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
      type uint32 {
        range "1024|1280|2048|2560|5120|"
          +"10240|60000";
@@ -719,7 +737,8 @@ module _3gpp-common-trace {
    }

    leaf tjMDTMeasurementPeriodUMTS {
      when './tjJobType = "IMMEDIATE_MDT_ONLY" or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
      when './tjJobType = "IMMEDIATE_MDT_ONLY"'
        +  'or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
      type uint32 {
        range "250|500|1000|2000|3000|4000|6000|8000|12000|16000|20000|"
          +"24000|28000|32000|64000";
@@ -734,7 +753,8 @@ module _3gpp-common-trace {
    }

    leaf tjMDTMeasurementQuantity {
      when './tjJobType = "IMMEDIATE_MDT_ONLY" or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
      when './tjJobType = "IMMEDIATE_MDT_ONLY"'
        +  ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
      type uint64 ;
      mandatory true;
      description "It specifies the measurements that are collected in an MDT
@@ -754,7 +774,8 @@ module _3gpp-common-trace {
    }

    leaf tjMDTPositioningMethod {
      when './tjJobType = "IMMEDIATE_MDT_ONLY" or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
      when './tjJobType = "IMMEDIATE_MDT_ONLY"'
        +  ' or ./tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
      type enumeration {
        enum GNSS;
        enum E_CELL_ID;
@@ -766,7 +787,8 @@ module _3gpp-common-trace {
    }

    leaf tjMDTReportAmount {
      when './tjJobType = "IMMEDIATE_MDT_ONLY" and ./tjMDTReportingTrigger = "PERIODICAL"';
      when './tjJobType = "IMMEDIATE_MDT_ONLY"'
        +  ' and ./tjMDTReportingTrigger = "PERIODICAL"';
      type union {
        type uint32 {
          range "1|4|8|16|32|64" ;
@@ -805,7 +827,8 @@ module _3gpp-common-trace {
    }

    leaf tjMDTReportInterval {
      when './tjJobType = "IMMEDIATE_MDT_ONLY" and ./tjMDTReportingTrigger = "PERIODICAL"';
      when './tjJobType = "IMMEDIATE_MDT_ONLY"'
        +  ' and ./tjMDTReportingTrigger = "PERIODICAL"';
      type uint32 {
        range "120|240|250|480|500|640|1000|1024|2000|2048|3000|4000|"
          +"5120|6000|8000|10240|12000|16000|20000|"
@@ -842,7 +865,8 @@ module _3gpp-common-trace {
      default "";
      description "It specifies which sensor information shall be included in
        logged NR MDT and immediate NR MDT measurement if they are available.
        The following sensor measurement can be included or excluded for the UE.";
        The following sensor measurement can be included or excluded for 
        the UE.";
      reference "Clause 5.10.29 of 3GPP TS 32.422";
    }

@@ -850,7 +874,8 @@ module _3gpp-common-trace {
      when './tjJobType = "LOGGED_MDT_ONLY" or ./tjJobType = "LOGGED_MBSFN_MDT"';
      type uint8;
      mandatory true;
      description "It specifies the TCE Id which is sent to the UE in Logged MDT.";
      description "It specifies the TCE Id which is sent to the UE in 
        Logged MDT.";
      reference "Clause 5.10.11 of 3GPP TS 32.422";
    }
  }
@@ -868,6 +893,8 @@ module _3gpp-common-trace {
    list TraceJob {
      description "Represents the Trace Control and Configuration parameters of a
        particular Trace Job (see TS 32.421 and TS 32.422 for details).
        It can be name-contained by SubNetwork, ManagedElement, ManagedFunction 
        or NetworkSliceSubnet.

        To activate Trace Jobs, a MnS consumer has to create TraceJob object
        instances on the MnS producer. A MnS consumer can activate a Trace Job
@@ -881,6 +908,83 @@ module _3gpp-common-trace {
        For details of management Trace Job activation/deactivation see clause
        4.1.1.1.2 of TS 32.422.
        
        The attribute tjJobType specifies the kind of data to collect. Dependent 
        on the selected type various parameters shall be available. The 
        attributes tjJobType, tjTraceReference, tjTraceRecordSessionReference, 
        tjTraceCollectionEntityAddress and tjTraceReportingFormat are mandatory 
        for all job types. If streaming reporting is selected for 
        tjTraceReportingFormat, tjStreamingTraceConsumerURI shall be present 
        additionally. The attribute tjPLMNTarget shall be present if trace 
        activation method is management based.

        For the different job types the attributes are differentiated as follows:
        -	In case of TRACE_ONLY additionally the following attributes shall be 
        available: tjListOfNeTypes, tjTraceDepth, tjTraceTarget and 
        tjTriggeringEvent.

        For this case the optional attribute tjListOfInterfaces allows to 
        specify the interfaces to be recorded.

        -	In case of IMMEDIATE_MDT_ONLY additionally the following attributes 
        shall be available:
          -	tjTraceTarget
          -	tjMDTAnonymizationOfData, 
          -	tjMDTListOfMeasurements, 
          -	tjMDTCollectionPeriodRrmUmts (conditional for M3, M4 and M5 in UMTS),
          -	tjMDTMeasurementPeriodUMTS (conditional for M6 and M7 in UMTS),
          -	tjMDTCollectionPeriodRrmLte (conditional for M2 and M3 in LTE), 
          -	tjMDTMeasurementPeriodLTE (conditional for M4 and M5 in LTE),
          -	tjMDTCollectionPeriodM6Lte (conditional for M6 in LTE), 
          -	tjMDTCollectionPeriodM7Lte (conditional for M7 in LTE),
          -	tjMDTCollectionPeriodRrmNR (conditional for M4 and M5 in NR), 
          -	tjMDTCollectionPeriodM6NR (conditional for M6 in NR), 
          -	tjMDTCollectionPeriodM7NR (conditional for M7 in NR), 
          -	tjMDTReportInterval (conditional for M1 in LTE or NR and M1/M2 in 
            UMTS), 
          -	tjMDTReportAmount (conditional for M1 in LTE or NR and M1/M2 in 
            UMTS), 
          -	tjMDTReportingTrigger (conditional for M1 in LTE or NR and M1/M2 in 
            UMTS), 
          -	tjMDTEventThreshold (conditional for A2 event reporting or A2 event 
            triggered periodic reporting), 
          -	tjMDTMeasurementQuantity (conditional for 1F event reporting). 

        For this case the optional attribute tjMDTAreaScope allows to specify 
        the area in terms of cells or Tracking Area/Routing Area/Location area 
        where the MDT data collection shall take place and the optional 
        attributes tjMDTPositioningMethod, tjMDTSensorInformation allow to 
        specify the positioning methods to use or the sensor information to 
        include.

        -	In case of IMMEDIATE_MDT_AND_TRACE both additional attributes of 
        TRACE_ONLY and IMMEDIATE_MDT_ONLY shall apply.

        -	In case of LOGGED_MDT_ONLY additionally the following attributes 
        shall be available: tjTraceTarget, tjMDTAnonymizationOfData, 
        tjMDTTraceCollectionEntityID, tjMDTLoggingInterval, 
        tjMDTLoggingDuration, tjMDTReportType, 
        tjMDTEventListForTriggeredMeasurements.

        For this case the optional attribute tjMDTAreaScope allows to specify 
        the area in terms of cells or Tracking Area/Routing Area/Location area 
        where the MDT data collection shall take place, the optional attribute 
        tjMDTPLMNList allows to specify the PLMNs where measurement collection, 
        status indication and log reporting is allowed, the optional attribute 
        tjMDTAreaConfigurationForNeighCell allows to specify the area for 
        which UE is requested to perform measurements logging for neighbour 
        cells which have list of frequencies and the optional attribute 
        tjMDTSensorInformation allows to specify the sensor information to 
        include.

        -	In case of RLF_REPORT_ONLY and RCEF_REPORT_ONLY additionally the 
        attribute tjTraceTarget shall be available, the optional attribute 
        tjMDTAreaScope allows to specify the eNB or list of eNBs or gNB or 
        list of gNBs where the reports should be collected.

        -	In case of LOGGED_MBSFN_MDT additionally the following attributes 
        shall be available: tjMDTAnonymizationOfData, tjMDTLoggingInterval, 
        tjMDTLoggingDuration, tjMDTMBSFNAreaList.
        
        Creation and deletion of TraceJob instances by MnS consumers is optional;
        when not supported, the TraceJob instances may be created and deleted by
        the system or be pre-installed.";