From 5c85b65c51abd4c50551de290dfd4ae8be8556a2 Mon Sep 17 00:00:00 2001
From: sunse <sean.sun@nokia-sbell.com>
Date: Mon, 30 Sep 2024 06:06:33 +0000
Subject: [PATCH] Rel16 TS28541 CR13013 correction to misalignment of stage 2
 and stage 3 for CellIndividualOffset and QOffsetRangeList

---
 OpenAPI/TS28541_NrNrm.yaml | 53 +++++++++++++-------------------------
 1 file changed, 18 insertions(+), 35 deletions(-)

diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml
index 105d173ed..1397c64c2 100644
--- a/OpenAPI/TS28541_NrNrm.yaml
+++ b/OpenAPI/TS28541_NrNrm.yaml
@@ -1,10 +1,10 @@
 openapi: 3.0.1
 info:
   title: NR NRM
-  version: 16.21.0
+  version: 16.22.0
   description: >-
     OAS 3.0.1 specification of the NR NRM
-    © 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.541; 5G NRM, NR NRM
@@ -277,23 +277,9 @@ components:
         ipv6Address:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr'
 
-    CellIndividualOffset:
-      type: object
-      properties:
-        rsrpOffsetSSB:
-          type: integer
-        rsrqOffsetSSB:
-          type: integer
-        sinrOffsetSSB:
-          type: integer
-        rsrpOffsetCSI-RS:
-          type: integer
-        rsrqOffsetCSI-RS:
-          type: integer
-        sinrOffsetCSI-RS:
-          type: integer
     QOffsetRange:
       type: integer
+      default: 0
       enum:
         - -24
         - -22
@@ -326,21 +312,6 @@ components:
         - 3
         - 2
         - 1
-    QOffsetRangeList:
-      type: object
-      properties:
-        rsrpOffsetSSB:
-          $ref: '#/components/schemas/QOffsetRange'
-        rsrqOffsetSSB:
-          $ref: '#/components/schemas/QOffsetRange'
-        sinrOffsetSSB:
-          $ref: '#/components/schemas/QOffsetRange'
-        rsrpOffsetCSI-RS:
-          $ref: '#/components/schemas/QOffsetRange'
-        rsrqOffsetCSI-RS:
-          $ref: '#/components/schemas/QOffsetRange'
-        sinrOffsetCSI-RS:
-          $ref: '#/components/schemas/QOffsetRange'
     QOffsetFreq:
       type: number
     TReselectionNRSf:
@@ -1085,7 +1056,11 @@ components:
                     nRTCI:
                       type: integer
                     cellIndividualOffset:
-                      $ref: '#/components/schemas/CellIndividualOffset'
+                      type: array
+                      items:
+                        $ref: '#/components/schemas/QOffsetRange'
+                      minItems: 6
+                      maxItems: 6
                     adjacentNRCellRef:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                     nRFrequencyRef:
@@ -1120,7 +1095,11 @@ components:
                   type: object
                   properties:
                     offsetMO:
-                      $ref: '#/components/schemas/QOffsetRangeList'
+                      type: array
+                      items:
+                        $ref: '#/components/schemas/QOffsetRange'
+                      minItems: 6
+                      maxItems: 6  
                     blackListEntry:
                       type: array
                       items:
@@ -1183,7 +1162,11 @@ components:
               type: object
               properties:
                     cellIndividualOffset:
-                      $ref: '#/components/schemas/CellIndividualOffset'
+                      type: array
+                      items:
+                        $ref: '#/components/schemas/QOffsetRange'
+                      minItems: 6
+                      maxItems: 6
                     blackListEntry:
                       type: array
                       items:
-- 
GitLab