Commit 9b50c545 authored by mouqueta's avatar mouqueta
Browse files

Merge branch 'Integration_Rel16_SA5_158_YANG' into 'Rel-16'

Integration_Rel16_SA5_158_YANG into Rel-16

See merge request !1525
parents 6607f42f 62d8fee9
Loading
Loading
Loading
Loading
Loading
+64 −27
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ module _3gpp-common-trace {
      Integration Reference Point (IRP);
      Information Service (IS)";

  revision 2024-11-05 { reference "CR-0468"; }
  revision 2023-11-04 { reference "CR-0292 CR-0300"; }
  revision 2023-02-16 { reference "CR-0231"; }
  revision 2023-02-14 { reference "CR-0235"; }
@@ -533,22 +534,22 @@ module _3gpp-common-trace {
        ManagedEntity playing a role of ServinGWFunction.

        In case of signaling based Trace/MDT, the traceTarget attribute shall 
        be able to carry (IMSI or IMEI(SV)or SUPI), the MDTAreaScope attribute 
        be able to carry (IMSI or IMEI(SV)or SUPI), the areaScope 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 traceTarget attribute
        shall be null value, the MDTAreaScope attribute shall carry a list of
        shall be null value, the areaScope attribute shall carry a list of
        (Utrancell or E-UtranCell or NRCellDU).

        In case of management based Logged MDT, the traceTarget 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 traceTarget. The MDTAreaScope 
        on the specified eNB or RNC or gNB in traceTarget. The areaScope 
        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 traceTarget 
        attribute shall be null value, the MDTAreaScope attribute shall carry 
        attribute shall be null value, the areaScope attribute shall carry 
        one or list of eNBs/gNBs";
      reference "3GPP TS 32.422";
    }
@@ -564,7 +565,7 @@ module _3gpp-common-trace {
    }

    leaf MDTAnonymizationOfData {
      when ../MDTAreaScope ;
      when ../areaScope ;
      type enumeration {
        enum NO_IDENTITY;
        enum TAC_OF_IMEI;
@@ -574,7 +575,7 @@ module _3gpp-common-trace {
      reference "3GPP TS 32.422 clause 5.10.12.";
    }

    list MDTAreaConfigurationForNeighCell {
    list AreaConfigurationForNeighCell {
      when '../jobType = "LOGGED_MDT_ONLY"';
      key "idx";
      min-elements 1;
@@ -597,23 +598,13 @@ module _3gpp-common-trace {
      }
    }

    leaf-list MDTAreaScope {
      type string;
      description "specifies MDT area scope when activates an MDT job.

      For RLF and RCEF reporting it specifies the eNB or list of eNBs where the
      RLF or RCEF reports should be collected.


      List of cells/TA/LA/RA for signaling based MDT or management based Logged
      MDT.

      List of cells for management based Immediate MDT.

      Cell, TA, LA, RA are mutually exclusive.

      One or list of eNBs for RLF and RCEFreporting";
      reference "Clause 5.10.2 of 3GPP TS 32.422";
    list areaScope {
      description "it specifies the area where data shall be collected";
      key idx;
      min-elements 0;
      max-elements 1;
      leaf idx {type string; }
      uses AreaScopeGrp;
    }

    leaf MDTCollectionPeriodRrmLte {
@@ -1014,6 +1005,52 @@ module _3gpp-common-trace {
    }
  }

 grouping AreaScopeGrp {
    description "Represents the AreaScope dataType.
    This <<dataType>> defines the area scope of MDT.
    The Area Scope parameter in LTE and NR is either:
    - list of Cells, identified by E-UTRAN-CGI or NG-RAN CGI. 
    Maximum 32 CGI can be defined.
    - list of Tracking Area, identified by TAC. 
    Maximum of 8 TAC can be defined. 
    - list of Tracking Area Identity, identified by TAC with 
    associated plmn-Identity perTAC-List containing the 
    PLMN identity for each TAC. Maximum of 8 TAI can be defined.";    

    choice AreaScopeChoice {
      leaf-list eutraCellIdList {
        type string;
        min-elements 1;
        max-elements 32;
        description "List of E-UTRAN cells identified by E-UTRAN-CGI";
      }
      
      leaf-list nrCellIdList {
        type string;
        min-elements 1;
        max-elements 32;
        description "List of NR cells identified by NG-RAN CGI";
      }
      
      leaf-list tacList {
        type types3gpp:Tac;
        min-elements 1;
        max-elements 8;
        description "Tracking Area Code list";
      }
      
      list taiList {
        description "Tracking Area Identity list";
        key idx;
        min-elements 1;
        max-elements 8;
        leaf idx { type string; }
        uses types3gpp:TaiGrp;
      }
    }
  }


  grouping TraceSubtree {
    description "Contains classes that manage Tracing.
      Should be used in all  classes (or classes inheriting from)
@@ -1088,7 +1125,7 @@ module _3gpp-common-trace {
            triggered periodic reporting), 
          - MDTMeasurementQuantity (conditional for 1F event reporting). 

        For this case the optional attribute MDTAreaScope allows to specify 
        For this case the optional attribute areaScope 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 MDTPositioningMethod, MDTSensorInformation allow to 
@@ -1104,12 +1141,12 @@ module _3gpp-common-trace {
        MDTLoggingDuration, MDTReportType, 
        MDTEventListForTriggeredMeasurements.

        For this case the optional attribute MDTAreaScope allows to specify 
        For this case the optional attribute areaScope 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 
        MDTPLMNList allows to specify the PLMNs where measurement collection, 
        status indication and log reporting is allowed, the optional attribute 
        MDTAreaConfigurationForNeighCell allows to specify the area for 
        areaConfigurationForNeighCell 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 
        MDTSensorInformation allows to specify the sensor information to 
@@ -1117,7 +1154,7 @@ module _3gpp-common-trace {

        - In case of RLF_REPORT_ONLY and RCEF_REPORT_ONLY additionally the 
        attribute traceTarget shall be available, the optional attribute 
        MDTAreaScope allows to specify the eNB or list of eNBs or gNB or 
        areaScope 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 
+20 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ module _3gpp-common-yang-types {
    network slicing.";
  reference "3GPP TS 28.623";

  revision 2024-11-05 { reference "CR-0468"; }
  revision 2021-11-01 { reference "CR-0141"; }
  revision 2020-11-06 {
    description "Removed incorrect S-NSSAI definitions.";
@@ -519,4 +520,23 @@ module _3gpp-common-yang-types {
    }
    units dB;
  }

      
  grouping TaiGrp {
    description "This <<dataType>> defines a Tracking Area Identity (TAI) 
      as specified in clause 28.6 of TS 23.003, clause 8.2 of TS 38.300 
      and clause 9.3.3.11 of TS 38.413. It is composed of the PLMN 
      identifier (PLMN-Id, which is composed of the MCC and MNC) and 
      the Tracking Area Code (TAC). ";
    list plmnId {
      description "PLMN Identity.";
      min-elements 1;
      max-elements 1;
      key "mcc mnc";
      uses types3gpp:PLMNId;
    }
    
    leaf tac { type Tac; }
  }

}
 No newline at end of file