From 014a31aabe959c639da14351b70043a3d625ca41 Mon Sep 17 00:00:00 2001
From: "U-ERICSSON\\ETHBLL" <balazs.lengyel@ericsson.com>
Date: Mon, 29 Jul 2024 13:31:26 +0200
Subject: [PATCH 1/2] Update description in ConditionMonitor

---
 yang-models/_3gpp-common-util.yang | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/yang-models/_3gpp-common-util.yang b/yang-models/_3gpp-common-util.yang
index 6e58aa14f..e5892c61a 100644
--- a/yang-models/_3gpp-common-util.yang
+++ b/yang-models/_3gpp-common-util.yang
@@ -3,6 +3,7 @@ module _3gpp-common-util {
   namespace urn:3gpp:sa5:_3gpp-common-util;
   prefix "util3gpp";
   
+  import ietf-yang-types { prefix yang ; }
   import _3gpp-common-top { prefix top3gpp; }  
   import _3gpp-common-yang-types { prefix types3gpp ; }
   import _3gpp-common-managed-element { prefix me3gpp ; }
@@ -16,6 +17,7 @@ module _3gpp-common-util {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.623";
 
+  revision 2024-07-30 { reference CR-xxxx; }
   revision 2024-05-06 { reference CR-0359; }
 
   feature SchedulerUnderManagedElement {
@@ -157,14 +159,22 @@ module _3gpp-common-util {
     description "Represents the Scheduler IOC.";
     
     leaf condition {
-      type string {
+      type yang:xpath1.0 {
         length 1..max;
       }
       mandatory true;
-      description "Logical expression of one or several condition(s). 
-
-        A restricted XPath may be used. The definition of the exact syntax 
-        is not ready yet.
+      description "A logical condition containing an XPath expression. 
+        The leaf contains an XPath 1.0 string with the following restrictions 
+        - The accessible tree is the full Network Resource Model 
+        - The root node is the list representing the top level MOI 
+        (E.g. ManagedElement)
+        - In the accessible tree, all leafs and leaf-lists with default values
+        in use exist
+        - The data tree has no concept of document order except when 'ordered-by 
+        user' is declared.
+        - The set of variable bindings is empty.
+        - The function library is the core function library defined in XPATH
+        - Namespaces should be ignored when evaluating the expression 
 
         An empty string is not allowed.";
     }
@@ -173,7 +183,8 @@ module _3gpp-common-util {
       type boolean;
       mandatory true;
       config false;
-      description "Switches between TRUE and FALSE depending upon whether the 
+      description "The boolean result of the condition.
+        Switches between TRUE and FALSE depending upon whether the 
         configured constraints are fulfilled or not.";
     }
   }
-- 
GitLab


From 31d75357a437f2007e79914b611181c290f3bfcc Mon Sep 17 00:00:00 2001
From: "U-ERICSSON\\ETHBLL" <balazs.lengyel@ericsson.com>
Date: Thu, 8 Aug 2024 18:42:55 +0200
Subject: [PATCH 2/2] Update revision statement

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

diff --git a/yang-models/_3gpp-common-util.yang b/yang-models/_3gpp-common-util.yang
index e5892c61a..389f5db6e 100644
--- a/yang-models/_3gpp-common-util.yang
+++ b/yang-models/_3gpp-common-util.yang
@@ -17,7 +17,7 @@ module _3gpp-common-util {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.623";
 
-  revision 2024-07-30 { reference CR-xxxx; }
+  revision 2024-07-30 { reference "CR-0392 CR-0393"; }
   revision 2024-05-06 { reference CR-0359; }
 
   feature SchedulerUnderManagedElement {
-- 
GitLab