From f76aeb9f0de1befd110b8f3556a15fd9a6d81d5f Mon Sep 17 00:00:00 2001
From: lengyelb <balazs.lengyel@ericsson.com>
Date: Wed, 17 Jan 2024 14:47:05 +0000
Subject: [PATCH 1/4] Update _3gpp-common-subscription-control.yang
 notificationFilter to use JEX

---
 yang-models/_3gpp-common-subscription-control.yang | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang
index e037ff83c..5db657c05 100755
--- a/yang-models/_3gpp-common-subscription-control.yang
+++ b/yang-models/_3gpp-common-subscription-control.yang
@@ -91,7 +91,10 @@ module _3gpp-common-subscription-control {
         If notificationFilter is present, only notifications that pass the 
         filter criteria are forwarded to the notification recipient; all other 
         notifications are discarded.
-        The filter can be applied to any field of a notification.";
+        The filter can be applied to any field of a notification.
+        
+        The sformat of the string shall follow JSON expressions (Jex)";
+      reference "3GPP TS 32.161";
     }
   }
   
@@ -288,4 +291,4 @@ module _3gpp-common-subscription-control {
       }
     }
   }   
-}
\ No newline at end of file
+}
-- 
GitLab


From a2153fd8e0a7a39f539124c6bc104715957cbd25 Mon Sep 17 00:00:00 2001
From: lengyelb <balazs.lengyel@ericsson.com>
Date: Wed, 17 Jan 2024 14:50:10 +0000
Subject: [PATCH 2/4] Update _3gpp-common-subscription-control.yang added
 revision statement

---
 yang-models/_3gpp-common-subscription-control.yang | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang
index 5db657c05..3790b24da 100755
--- a/yang-models/_3gpp-common-subscription-control.yang
+++ b/yang-models/_3gpp-common-subscription-control.yang
@@ -10,14 +10,15 @@ module _3gpp-common-subscription-control {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
     
   description "Defines IOCs for subscription and heartbeat control.
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.623
       Generic Network Resource Model (NRM)
       Integration Reference Point (IRP);
       Solution Set (SS) definitions
       3GPP TS 28.623";
-  
+
+  revision 2024-01-18 { reference CR-0309 ; } 
   revision 2023-09-18 { reference CR-0271 ; } 
   revision 2023-08-10 { reference "CR0257 CR0260"; }
   revision 2022-10-20 { reference CR-0196;   }
-- 
GitLab


From 494ddd7f35e8e34e06006de6d9359f745ee004a2 Mon Sep 17 00:00:00 2001
From: lengyelb <balazs.lengyel@ericsson.com>
Date: Wed, 17 Jan 2024 15:16:43 +0000
Subject: [PATCH 3/4] Update _3gpp-common-subscription-control.yang typo
 correction.

---
 yang-models/_3gpp-common-subscription-control.yang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang
index 3790b24da..ae720ef85 100755
--- a/yang-models/_3gpp-common-subscription-control.yang
+++ b/yang-models/_3gpp-common-subscription-control.yang
@@ -94,7 +94,7 @@ module _3gpp-common-subscription-control {
         notifications are discarded.
         The filter can be applied to any field of a notification.
         
-        The sformat of the string shall follow JSON expressions (Jex)";
+        The format of the string shall follow JSON expressions (Jex)";
       reference "3GPP TS 32.161";
     }
   }
-- 
GitLab


From 8e02b34fb45a173f608bc43d6c0f5d91a437da26 Mon Sep 17 00:00:00 2001
From: lengyelb <balazs.lengyel@ericsson.com>
Date: Wed, 17 Jan 2024 15:27:21 +0000
Subject: [PATCH 4/4] Update _3gpp-common-subscription-control.yang jex
 clarification

---
 yang-models/_3gpp-common-subscription-control.yang | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang
index ae720ef85..ed48ef995 100755
--- a/yang-models/_3gpp-common-subscription-control.yang
+++ b/yang-models/_3gpp-common-subscription-control.yang
@@ -94,7 +94,8 @@ module _3gpp-common-subscription-control {
         notifications are discarded.
         The filter can be applied to any field of a notification.
         
-        The format of the string shall follow JSON expressions (Jex)";
+        The format of the string shall confrm to a 
+        JSON expressions (Jex) 'JexConditionsExpr'";
       reference "3GPP TS 32.161";
     }
   }
-- 
GitLab