From d597d66bc575cd1dd19af499c5a13659c40cf75d Mon Sep 17 00:00:00 2001
From: sunse <sean.sun@nokia-sbell.com>
Date: Thu, 8 Aug 2024 06:51:55 +0000
Subject: [PATCH] TS28.623 Rel18 CR correction to duplicate Scope definition
 and misalignment

---
 OpenAPI/TS28623_GenericNrm.yaml             | 17 -------------
 OpenAPI/TS28623_SubscriptionControlNrm.yaml | 27 ++++++++++++---------
 2 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml
index 389d35d52..272fa9fd3 100755
--- a/OpenAPI/TS28623_GenericNrm.yaml
+++ b/OpenAPI/TS28623_GenericNrm.yaml
@@ -101,23 +101,6 @@ components:
           properties:
             streamTarget:
               $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
-    Scope:
-      oneOf:
-        - type: object
-          properties:
-            scopeType:
-              type: string
-              enum:
-                - BASE_ONLY
-                - BASE_ALL
-                - BASE_NTH_LEVEL
-                - BASE_SUBTREE
-            scopeLevel:
-              type: integer
-        - type: object
-          properties:
-            dataNodeSelector:
-              type: string
     ProcessMonitor:
       description: >-
         This data type is the "ProcessMonitor" data type without specialisations.
diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml
index c91ffec53..8ab7afaea 100644
--- a/OpenAPI/TS28623_SubscriptionControlNrm.yaml
+++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml
@@ -27,17 +27,22 @@ components:
 
 #-------- Definition of types-----------------------------------------------------
     Scope:
-      type: object
-      properties:
-        scopeType:
-          type: string
-          enum:
-            - BASE_ONLY
-            - BASE_ALL
-            - BASE_NTH_LEVEL
-            - BASE_SUBTREE
-        scopeLevel:
-          type: integer
+      oneOf:
+        - type: object
+          properties:
+            scopeType:
+              type: string
+              enum:
+                - BASE_ONLY
+                - BASE_ALL
+                - BASE_NTH_LEVEL
+                - BASE_SUBTREE
+            scopeLevel:
+              type: integer
+        - type: object
+          properties:
+            dataNodeSelector:
+              type: string
 
 #-------- Definition of concrete IOCs --------------------------------------------         
     NtfSubscriptionControl-Single:
-- 
GitLab