Commit 5e604652 authored by lengyelb's avatar lengyelb
Browse files

Merge branch 'TR28.623_R18_CR0487_Corrections_of_measurement_type' into... 

Merge branch 'TR28.623_R18_CR0487_Corrections_of_measurement_type' into 'Integration_Rel18_SA5_159_YANG'

Tr28.623 r18 cr0460 corrections of measurement type

See merge request !1550
parents 4306233e 9101fb78

yang-models/_3gpp-common-managementdatacollection.yang

+2 −6
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ module _3gpp-common-managementdatacollection { 
      Integration Reference Point (IRP);

      Information Service (IS)";



  revision 2025-02-05 { reference "CR-0460" ; }

  revision 2024-04-12 { reference CR-0346; } 

  revision 2023-11-18 { reference CR-0299 ; }

  revision 2023-11-06 { reference "CR-0305"; }
@@ -213,12 +214,7 @@ module _3gpp-common-managementdatacollection { 


            The metrics are identified with their names/identifiers.

            For performance measurements defined in TS 28.552 the name is

            constructed as follows:

              - 'family.measurementName.subcounter' for measurement types with

                subcounters

              - 'family.measurementName' for measurement types without

                subcounters

              - 'family' for measurement families

            constructed as the bullet e) of the measurement definition.



            For KPIs defined in TS 28.554 the name is defined according to the

            KPI definitions template as the component designated with a).

yang-models/_3gpp-common-measurements.yang

+5 −17
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ module _3gpp-common-measurements { 
      Integration Reference Point (IRP);

      Information Service (IS)";



  revision 2025-02-05 { reference CR-0460; }

  revision 2024-11-06 { reference CR-0487; } 

  revision 2024-05-06 { reference CR-0359; }

  revision 2024-02-24 { reference CR-0346; }
@@ -93,13 +94,8 @@ module _3gpp-common-measurements { 
        by other SDOs, or be vendor specific. Performance metrics are 

        identified with their names.



        For measurements defined in TS 28.552 the name is constructed as follows:

        - 'family.measurementName.subcounter' for measurement types with 

        subcounters

        - 'family.measurementName' for measurement types without subcounters

        `- 'family' for measurement families

        For KPIs defined in TS 28.554 [28] the name is defined in the KPI 

        definitions template as the component designated with e).

        For measurements defined in TS 28.552 the name is constructed as the

        bullet e) of the measurement definition.



        A name can also identify a vendor specific performance metric or a 

        group of vendor specific performance metrics.";
@@ -208,11 +204,7 @@ module _3gpp-common-measurements { 
          Measurements are identified by name.



          For measurements defined in TS 28.552 the name is constructed as

          follows:

          - 'family.measurementName.subcounter' for measurement types with

          subcounters

          - 'family.measurementName' for measurement types without subcounters

          - 'family' for measurement families

          the bullet e) of the measurement definition.



          For KPIs defined in TS 28.554 the name is defined in the KPI

          definitions template as the component designated with e).
@@ -282,11 +274,7 @@ module _3gpp-common-measurements { 
        identify a vendor specific group of performance metrics.



        For measurements defined in TS 28.552 the name is constructed as

        follows:

        - 'family.measurementName.subcounter' for measurement types with

        subcounters

        - 'family.measurementName' for measurement types without subcounters

        - 'family' for measurement families

        the bullet e) of the measurement definition.



        For KPIs defined in TS 28.554 the name is defined in the KPI

        definitions template as the component designated with e).";

yang-models/_3gpp-common-trace.yang

+11 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ module _3gpp-common-trace { 
      Integration Reference Point (IRP);

      Information Service (IS)" ;



  revision 2025-02-05 { reference "CR-0460" ; }

  revision 2024-11-05 { reference "CR-0470" ; }

  revision 2024-10-06 { reference "CR-0459"; }

  revision 2024-08-06 { reference "CR-0376 CR-0378 CR-0420"; }
@@ -1429,7 +1430,8 @@ module _3gpp-common-trace { 
    description "Defines the configuration parameters of IOC 

     TraceJob which are specific for MDT. The attribute 

     anonymizationOfMdtData specifies the level of anonymization 

     of MDT data.  The attribute areaScope defines the area scope of MDT, which is specified in clause 5.10.2 of TS 32.422.  The   

     of MDT data.  The attribute areaScope defines the area scope of MDT, 

     which is specified in clause 5.10.2 of TS 32.422.  The   

     optional attribute sensorInformation allows to 

     specify  the sensor information to include.  Based on the value 

     configured for attribute jobType in IOC TraceJob, the attributes
@@ -1510,7 +1512,14 @@ module _3gpp-common-trace { 
    

    leaf-list ueCoreMeasurements {

      type string;

      description "It specifies the List of 5GC UE level measurements.";

      min-elements 1;

      description "List of 5GC UE level measurements identified by name.



        The list may include 5GC UE level measurements defined in TS 28.558, 

        or vendor specific measurements.

        

        For non-3GPP specified 5GC UE level measurements the name is defined 

        elsewhere.";

    }



    leaf ueCoreMeasGranularityPeriod {