From 8583c34ae10b37136aa97dcb270ab40c17c044b5 Mon Sep 17 00:00:00 2001
From: yaoyiz <yizhi.yao@intel.com>
Date: Wed, 17 Jan 2024 22:07:44 +0000
Subject: [PATCH 1/2] Update TS28623_TraceControlNrm.yaml

---
 OpenAPI/TS28623_TraceControlNrm.yaml | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml
index 340072563..c25cf175d 100644
--- a/OpenAPI/TS28623_TraceControlNrm.yaml
+++ b/OpenAPI/TS28623_TraceControlNrm.yaml
@@ -21,10 +21,14 @@ components:
         - IMMEDIATE_MDT_ONLY
         - LOGGED_MDT_ONLY
         - TRACE_ONLY
-        - IMMEDIATE_MDT AND TRACE
+        - IMMEDIATE_MDT_AND_TRACE
         - RLF_REPORT_ONLY
         - RCEF_REPORT_ONLY
         - LOGGED_MBSFN_MDT
+        - UE_LEVEL_MEASUREMENTS_ONLY
+        - TRACE_AND_UE_LEVEL_MEASUREMENTS        
+        - IMMEDIATE_MDT_AND_UE_LEVEL_MEASUREMENTS
+        - TRACE_AND_IMMEDIATE_MDT_AND_UE_LEVEL_MEASUREMENTS           
 
     listOfInterfaces-Type:
       description: The interfaces to be recorded in the Network Element. See 3GPP TS 32.422 clause 5.5 for additional details.
@@ -1363,6 +1367,20 @@ components:
           $ref: '#/components/schemas/immediateMDTConfig-Type'
         loggedMDTConfig:
           $ref: '#/components/schemas/loggedMDTConfig-Type'
+
+    UEMeasConfig-Type:
+      description: UE level measurements configuration parameters for 5G system. See details in 3GPP TS 28.622 clause 4.3.x.
+      type: object
+      properties:
+        ueMeasurements:
+          type: string
+        ueMeasGranularityPeriod:
+          type: integer
+        objectInstances:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
+        rootObjectInstances:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
+
     AreaScope:
       oneOf:
       - type: array
@@ -1444,6 +1462,8 @@ components:
           $ref: '#/components/schemas/traceConfig-Type'
         mdtConfig:
           $ref: '#/components/schemas/mdtConfig-Type'
+        ueMeasConfig:
+          $ref: '#/components/schemas/UEMeasConfig-Type'
 
 #-------- end of Definition of types used in Trace control NRM fragment ----------
 
-- 
GitLab


From 075805512b250d8715b4d735dc3a373ac2ce9272 Mon Sep 17 00:00:00 2001
From: yaoyiz <yizhi.yao@intel.com>
Date: Thu, 1 Feb 2024 16:17:18 +0000
Subject: [PATCH 2/2] Update file TS28623_TraceControlNrm.yaml

---
 OpenAPI/TS28623_TraceControlNrm.yaml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml
index c25cf175d..20451d95f 100644
--- a/OpenAPI/TS28623_TraceControlNrm.yaml
+++ b/OpenAPI/TS28623_TraceControlNrm.yaml
@@ -25,10 +25,10 @@ components:
         - RLF_REPORT_ONLY
         - RCEF_REPORT_ONLY
         - LOGGED_MBSFN_MDT
-        - UE_LEVEL_MEASUREMENTS_ONLY
-        - TRACE_AND_UE_LEVEL_MEASUREMENTS        
-        - IMMEDIATE_MDT_AND_UE_LEVEL_MEASUREMENTS
-        - TRACE_AND_IMMEDIATE_MDT_AND_UE_LEVEL_MEASUREMENTS           
+        - 5GC_UE_LEVEL_MEASUREMENTS_ONLY
+        - TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS        
+        - IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS
+        - TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS           
 
     listOfInterfaces-Type:
       description: The interfaces to be recorded in the Network Element. See 3GPP TS 32.422 clause 5.5 for additional details.
@@ -1376,6 +1376,8 @@ components:
           type: string
         ueMeasGranularityPeriod:
           type: integer
+        nfTypeToMeasure:
+          type: string          
         objectInstances:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
         rootObjectInstances:
-- 
GitLab