From 5e05f9701baf0f4f4e7e8de704df50555a17c13a Mon Sep 17 00:00:00 2001
From: sunse <sean.sun@nokia-sbell.com>
Date: Thu, 3 Oct 2024 14:24:22 +0000
Subject: [PATCH] TS28.623 Rel18 CR0441 and TS28532 CR0343 correction to Jex
 for dataNodeSelector and notificationFilter in OpenAPI

---
 OpenAPI/TS28532_ProvMnS.yaml                |  7 +++++--
 OpenAPI/TS28623_ComDefs.yaml                | 17 ++++++++++++++++-
 OpenAPI/TS28623_SubscriptionControlNrm.yaml |  6 ++++--
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml
index 116dfc4b7..797d7ca86 100755
--- a/OpenAPI/TS28532_ProvMnS.yaml
+++ b/OpenAPI/TS28532_ProvMnS.yaml
@@ -219,7 +219,7 @@ paths:
             are targeted.
           required: false
           schema:
-            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter'
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexConditions'
         - name: attributes
           in: query
           description: >-
@@ -251,7 +251,10 @@ paths:
             select data nodes.
           required: false
           schema:
-            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter'
+            oneOf:
+              - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionBasic'
+              - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionAdvanced'
+
       responses:
         '200':
           description: >-
diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml
index f5985b380..9319640df 100755
--- a/OpenAPI/TS28623_ComDefs.yaml
+++ b/OpenAPI/TS28623_ComDefs.yaml
@@ -238,6 +238,21 @@ components:
       description: >-
         The filter format shall be compliant to Jex (TS 32.161).
       type: string
+    JexConditions:
+      type: string
+      description: >-
+        The value of the string shall be a Jex expression that is compliant to the 
+        Jex conditions profile specified in clause 7.6 of TS 32.161.
+    JexNodeSelectionBasic:
+      type: string
+      description: >-
+        The value of the string shall be a Jex expression that is compliant to the 
+        Jex basic profile specified in clause 7.4 of TS 32.161.
+    JexNodeSelectionAdvanced:
+      type: string
+      description: >-
+        The value of the string shall be a Jex expression that is compliant to the 
+        Jex advanced profile specified in clause 7.5 of TS 32.161.
     SystemDN:
       type: string
 
@@ -289,7 +304,7 @@ components:
         timeTick:
           type: integer
         filter:
-          $ref: '#/components/schemas/Filter'
+          $ref: '#/components/schemas/JexConditions'
 
     ErrorResponseGet:
       description: >-
diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml
index e808716e6..35de0f831 100644
--- a/OpenAPI/TS28623_SubscriptionControlNrm.yaml
+++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml
@@ -29,7 +29,9 @@ components:
         - type: object
           properties:
             dataNodeSelector:
-              type: string
+              oneOf:
+                - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionBasic'
+                - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionAdvanced'
 
 #-------- Definition of concrete IOCs --------------------------------------------         
     NtfSubscriptionControl-Single:
@@ -49,7 +51,7 @@ components:
                 scope:
                   $ref: '#/components/schemas/Scope'
                 notificationFilter:
-                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter'                
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexConditions'                
             HeartbeatControl:
               $ref: '#/components/schemas/HeartbeatControl-Single'
     HeartbeatControl-Single:
-- 
GitLab