From e726ffdfa594aa448a23ecbcc1c0f4e16778d6dd Mon Sep 17 00:00:00 2001
From: ruiyue <xuruiyue@huawei.com>
Date: Mon, 16 Aug 2021 11:22:08 +0200
Subject: [PATCH] Add YAML (Rest based) solution set for the CR S5-213508 which
 proposes to convert the 5QI characteristics datatype to IOC

---
 OpenAPI/5gcNrm.yaml | 51 ++++++++++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml
index fd61fca9d..50d31111a 100644
--- a/OpenAPI/5gcNrm.yaml
+++ b/OpenAPI/5gcNrm.yaml
@@ -265,26 +265,7 @@ components:
           type: integer
         exponent:
           type: integer
-    FiveQICharacteristics:
-      type: object
-      properties:
-        fiveQIValue:
-          type: integer
-        resourceType:
-          type: string
-          enum:
-            - GBR
-            - NonGBR
-        priorityLevel:
-          type: integer
-        packetDelayBudget:
-          type: integer
-        packetErrorRate:
-          $ref: '#/components/schemas/PacketErrorRate'
-        averagingWindow:
-          type: integer
-        maximumDataBurstVolume:
-          type: integer
+
 
 
     GtpUPathDelayThresholdsType:
@@ -1637,6 +1618,32 @@ components:
                       items:
                         $ref: '#/components/schemas/FiveQiDscpMapping'
 
+    FiveQICharacteristics-Single:
+      allOf:
+        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
+        - type: object
+          properties:
+            fiveQIValue:
+              type: integer
+            resourceType:
+              type: string
+              enum:
+                - GBR
+                - NonGBR
+            priorityLevel:
+              type: integer
+            packetDelayBudget:
+              type: integer
+            packetErrorRate:
+              $ref: '#/components/schemas/PacketErrorRate'
+            averagingWindow:
+              type: integer
+            maximumDataBurstVolume:
+              type: integer
+    FiveQICharacteristics-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/FiveQICharacteristics-Single' 
     Configurable5QISet-Single:
       allOf:
         - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
@@ -1649,7 +1656,7 @@ components:
                     configurable5QIs:
                       type: array
                       items:
-                        $ref: '#/components/schemas/FiveQICharacteristics'  
+                        $ref: '#/components/schemas/FiveQICharacteristics-Multiple'  
    
     Dynamic5QISet-Single:
       allOf:
@@ -1663,7 +1670,7 @@ components:
                     dynamic5QIs:
                       type: array
                       items:
-                        $ref: '#/components/schemas/FiveQICharacteristics'                           
+                        $ref: '#/components/schemas/FiveQICharacteristics-Multiple'                           
                       
     GtpUPathQoSMonitoringControl-Single:
       allOf:
-- 
GitLab