OpenAPI/TS28623_SubscriptionControlNrm.yaml

 openapi: 3.0.1
 info:
   title: Subscription Control NRM
-  version: 18.2.0
+  version: 18.7.0
   description: >-
     OAS 3.0.1 definition of the Subscription Control NRM fragment
-    © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
   description: 3GPP TS 28.623; Generic NRM, Subscription Control NRM
@@ -58,8 +58,10 @@ components:
                 heartbeatNtfPeriod:
                   type: integer
                   minimum: 0
+                  default: 0
                 triggerHeartbeatNtf:
                   type: boolean
+                  default: FALSE
 
 #-------- Definition of YAML arrays for name-contained IOCs ----------------------
     NtfSubscriptionControl-Multiple:

OpenAPI/TS28623_TraceControlNrm.yaml

 openapi: 3.0.1
 info:
   title: Trace Control NRM
-  version: 18.6.0
+  version: 18.7.0
   description: >-
     OAS 3.0.1 definition of the Trace Control NRM fragment
-    © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
     All rights reserved.
 externalDocs:
   description: 3GPP TS 28.623; Generic NRM,Trace Control NRM
@@ -29,7 +29,7 @@ components:
         - TRACE_AND_5GC_UE_LEVEL_MEASUREMENTS        
         - IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS
         - TRACE_AND_IMMEDIATE_MDT_AND_5GC_UE_LEVEL_MEASUREMENTS           
-
+      default: TRACE_ONLY
     listOfInterfaces-Type:
       description: The interfaces to be recorded in the Network Element. See 3GPP TS 32.422 clause 5.5 for additional details.
       type: object
@@ -403,6 +403,13 @@ components:
         - mcc
         - mnc
 
+    listOfTraceMetrics:
+      description: The trace metrics to be reported. See 3GPP TS 32.422 clause 10 for additional details.
+      type: array
+      items:
+        type: string 
+      
+
     traceDepth-Type:
       description: Specifies how detailed information should be recorded in the Network Element. The Trace Depth is a paremeter for Trace Session level, i.e., the Trace Depth is the same for all of the NEs to be traced in the same Trace Session. See 3GPP TS 32.422 clause 5.3 for additional details.
       type: string
@@ -413,6 +420,7 @@ components:
         - VENDORMINIMUM
         - VENDORMEDIUM
         - VENDORMAXIMUM
+      default: MAXIMUM   
 
     traceReference-Type:
       type: object
@@ -435,6 +443,7 @@ components:
       enum:
         - FILE-BASED
         - STREAMING
+      default: FILE-BASED   
 
     traceTarget-Type:
       type: object
@@ -624,6 +633,7 @@ components:
       enum:
         - NO_IDENTITY
         - TAC_OF_IMEI
+      default: NO_IDENTITY  
     
     beamLevelMeasurement-Type:
       description: Determines whether beam level measurements shall be included in case of immediate MDT M1 measurement in NR. For additional details see 3GPP TS 32.422 clause 5.10.40.
@@ -1368,13 +1378,13 @@ components:
         loggedMDTConfig:
           $ref: '#/components/schemas/loggedMDTConfig-Type'
 
-    UEMeasConfig-Type:
+    UECoreMeasConfig-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:
+        ueCoreMeasurements:
           type: string
-        ueMeasGranularityPeriod:
+        ueCoreMeasGranularityPeriod:
           type: integer
         nfTypeToMeasure:
           type: string          
@@ -1448,6 +1458,8 @@ components:
           $ref: '#/components/schemas/plmnTarget-Type'
         nPNTarget:
           $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type'
+        listOfTraceMetrics:
+          type: array
         traceReportingConsumerUri:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
         traceCollectionEntityIpAddress:
@@ -1464,8 +1476,8 @@ components:
           $ref: '#/components/schemas/traceConfig-Type'
         mdtConfig:
           $ref: '#/components/schemas/mdtConfig-Type'
-        ueMeasConfig:
-          $ref: '#/components/schemas/UEMeasConfig-Type'
+        ueCoreMeasConfig:
+          $ref: '#/components/schemas/UECoreMeasConfig-Type'
 
 #-------- end of Definition of types used in Trace control NRM fragment ----------