From 0c88330d6ec5f5fd709c7ff51301c58b0d9c52cd Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 6 Nov 2024 13:58:28 +0000
Subject: [PATCH 01/34] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 30a4db45b..c7f87d710 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -8,6 +8,8 @@ module _3gpp-common-trace {
   import _3gpp-common-yang-extensions {prefix yext3gpp; }
   import ietf-inet-types { prefix inet; }
   import _3gpp-common-files { prefix files3gpp; }
+  import _3gpp-5g-common-yang-types { prefix types5g; }
+
 
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -25,6 +27,7 @@ module _3gpp-common-trace {
       Integration Reference Point (IRP);
       Information Service (IS)" ;
 
+  revision 2024-11-05 { reference "CR-0XXX"; }
   revision 2024-08-13 { reference "CR-0387 CR-0377"; } 
   revision 2024-08-07 { reference "CR-0405 CR-0421 CR-0379"; }
   revision 2024-05-12 { reference "CR-0401"; }
@@ -133,6 +136,13 @@ module _3gpp-common-trace {
         description "Tracking Area Code list";
       }
       
+      leaf-list sliceScope {
+        type types5g:SNssai;
+        min-elements 1;
+        max-elements 1024;
+        description "Network Slice scope";
+      }
+
       list taiList {
         description "Tracking Area Identity list";
         key idx;
-- 
GitLab


From 4a6a69f6abeb2b660061bdaaa5662522a380f9d9 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 6 Nov 2024 14:06:34 +0000
Subject: [PATCH 02/34] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index c7f87d710..151b4cd76 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -136,11 +136,11 @@ module _3gpp-common-trace {
         description "Tracking Area Code list";
       }
       
-      leaf-list sliceScope {
+      leaf-list sliceList {
         type types5g:SNssai;
         min-elements 1;
         max-elements 1024;
-        description "Network Slice scope";
+        description "Network Slice list";
       }
 
       list taiList {
-- 
GitLab


From 1f705d76528a0240ae1e1bc71b3ab712f57edc1e Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 6 Nov 2024 14:14:06 +0000
Subject: [PATCH 03/34] Update _3gpp-common-trace.yang

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

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 151b4cd76..a284d1f10 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -137,7 +137,7 @@ module _3gpp-common-trace {
       }
       
       leaf-list sliceList {
-        type types5g:SNssai;
+        uses types5g:SNssai;
         min-elements 1;
         max-elements 1024;
         description "Network Slice list";
-- 
GitLab


From 0a576013f4591776a2a78a19f88580406f3fd2f5 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 6 Nov 2024 14:26:45 +0000
Subject: [PATCH 04/34] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index a284d1f10..8628e8366 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -8,8 +8,7 @@ module _3gpp-common-trace {
   import _3gpp-common-yang-extensions {prefix yext3gpp; }
   import ietf-inet-types { prefix inet; }
   import _3gpp-common-files { prefix files3gpp; }
-  import _3gpp-5g-common-yang-types { prefix types5g; }
-
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
 
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -135,12 +134,13 @@ module _3gpp-common-trace {
         max-elements 8;
         description "Tracking Area Code list";
       }
-      
-      leaf-list sliceList {
-        uses types5g:SNssai;
+
+      list sliceList {
+        description "Network Slice list";
+        uses types5g3gpp:SNssai;
         min-elements 1;
         max-elements 1024;
-        description "Network Slice list";
+        key "sd sst";
       }
 
       list taiList {
-- 
GitLab


From 8dcf7d5386eb9521a53db216c7aecfc47fe2572a Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Fri, 8 Nov 2024 12:30:48 +0000
Subject: [PATCH 05/34] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 8628e8366..91d3e0857 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -135,7 +135,7 @@ module _3gpp-common-trace {
         description "Tracking Area Code list";
       }
 
-      list sliceList {
+      list sliceIdList {
         description "Network Slice list";
         uses types5g3gpp:SNssai;
         min-elements 1;
@@ -1561,8 +1561,8 @@ module _3gpp-common-trace {
       type uint32;
       mandatory true;
       units milliseconds;
-      description "It specifies the Granularity period used to produce 5GC UE level 
-        measurements. The period is defined in milliseconds (ms).";
+      description "It specifies the Granularity period used to produce 5GC UE 
+        level measurements. The period is defined in milliseconds (ms).";
     }
 
     leaf nfTypeToMeasure {
@@ -1884,10 +1884,10 @@ module _3gpp-common-trace {
         only, RCEF reports only and Logged MBSFN MDT, the configuration 
         parameters of attribute mdtConfig or a subset of these shall be 
         applied. In case of UE measurements only, the configuration parameters 
-        of attribute ueCoreMeasConfig shall be applied. In case of any combination 
-        of Trace, Immediate MDT, Trace and UE measurements, the configuration
-        parameters of the corresponding attributes traceConfig, mdtConfig and 
-        ueCoreMeasConfig are applicable. 
+        of attribute ueCoreMeasConfig shall be applied. In case of any 
+        combination of Trace, Immediate MDT, Trace and UE measurements, the 
+        configuration parameters of the corresponding attributes traceConfig, 
+        mdtConfig and ueCoreMeasConfig are applicable. 
 
         Creation and deletion of TraceJob instances by MnS consumers is 
         optional; when not supported, the TraceJob instances may be created 
-- 
GitLab


From a7515f88edf7ae5b33dfbafc821bdab9fff08eb5 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Fri, 8 Nov 2024 13:31:46 +0000
Subject: [PATCH 06/34] Update _3gpp-common-trace.yang

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

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 91d3e0857..1d625f7ee 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -26,7 +26,7 @@ module _3gpp-common-trace {
       Integration Reference Point (IRP);
       Information Service (IS)" ;
 
-  revision 2024-11-05 { reference "CR-0XXX"; }
+  revision 2024-11-05 { reference "CR-0480"; }
   revision 2024-08-13 { reference "CR-0387 CR-0377"; } 
   revision 2024-08-07 { reference "CR-0405 CR-0421 CR-0379"; }
   revision 2024-05-12 { reference "CR-0401"; }
-- 
GitLab


From 3cb518cce87407734e8ec92a3afe9daee0b0547c Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 20 Nov 2024 14:29:08 +0000
Subject: [PATCH 07/34] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 1d625f7ee..c8281c0c0 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -107,6 +107,25 @@ module _3gpp-common-trace {
     }
   }
   
+  grouping ScopeIdScope {
+    description "This <<datatype>> provides a PLMN Id and associated
+      slice ids (S-NSSAI).";
+      
+    leaf plmnId {
+      description "It specifies a PLMN Id.";
+      type types3gpp:PLMNId;
+      min-elements 1;
+    }
+
+    list sliceIdList {
+      key idx;
+      min-elements 1;
+      description "It specifies slice identified by S-NSSAI.";
+      leaf idx { type types5g3gpp:snssai; }
+    }
+  } 
+  
+
   grouping AreaScopeGrp {
     description "Represents the AreaScope dataType.
       This <<dataType>> defines the area scope of MDT and QoE.
@@ -137,7 +156,7 @@ module _3gpp-common-trace {
 
       list sliceIdList {
         description "Network Slice list";
-        uses types5g3gpp:SNssai;
+        uses SliceIdScope;
         min-elements 1;
         max-elements 1024;
         key "sd sst";
-- 
GitLab


From 7ee41fadcc0df83be94951b18825fa06f25861a1 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 20 Nov 2024 14:36:49 +0000
Subject: [PATCH 08/34] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index c8281c0c0..6d3a70805 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -107,7 +107,7 @@ module _3gpp-common-trace {
     }
   }
   
-  grouping ScopeIdScope {
+  grouping SliceIdScope {
     description "This <<datatype>> provides a PLMN Id and associated
       slice ids (S-NSSAI).";
       
@@ -121,7 +121,7 @@ module _3gpp-common-trace {
       key idx;
       min-elements 1;
       description "It specifies slice identified by S-NSSAI.";
-      leaf idx { type types5g3gpp:snssai; }
+      leaf idx { type types5g3gpp:SNssai; }
     }
   } 
   
-- 
GitLab


From 04b4dcf6c0b880b0de93ffc26d700f2c52925fdc Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 20 Nov 2024 14:43:46 +0000
Subject: [PATCH 09/34] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 1 -
 1 file changed, 1 deletion(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 6d3a70805..259f88074 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -114,7 +114,6 @@ module _3gpp-common-trace {
     leaf plmnId {
       description "It specifies a PLMN Id.";
       type types3gpp:PLMNId;
-      min-elements 1;
     }
 
     list sliceIdList {
-- 
GitLab


From 3b8d93f9e327c99f0521c26246591cca7e1a01b9 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 20 Nov 2024 14:48:37 +0000
Subject: [PATCH 10/34] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 259f88074..23e75e2b2 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -8,7 +8,7 @@ module _3gpp-common-trace {
   import _3gpp-common-yang-extensions {prefix yext3gpp; }
   import ietf-inet-types { prefix inet; }
   import _3gpp-common-files { prefix files3gpp; }
-  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
+  
 
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -120,7 +120,7 @@ module _3gpp-common-trace {
       key idx;
       min-elements 1;
       description "It specifies slice identified by S-NSSAI.";
-      leaf idx { type types5g3gpp:SNssai; }
+      leaf idx { type types3gpp:SNssai; }
     }
   } 
   
-- 
GitLab


From f1dcca252b2ac4a6611a743987b55264cb8d0517 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 20 Nov 2024 14:51:49 +0000
Subject: [PATCH 11/34] Update _3gpp-common-trace.yang

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

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 23e75e2b2..97af57ceb 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -116,11 +116,10 @@ module _3gpp-common-trace {
       type types3gpp:PLMNId;
     }
 
-    list sliceIdList {
-      key idx;
+    leaf-list sliceIdList {
+      type types3gpp:SNssai;
       min-elements 1;
       description "It specifies slice identified by S-NSSAI.";
-      leaf idx { type types3gpp:SNssai; }
     }
   } 
   
-- 
GitLab


From 69366d543ab2e61077e630cdb11e550daa83e95e Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 20 Nov 2024 14:54:20 +0000
Subject: [PATCH 12/34] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 2 --
 1 file changed, 2 deletions(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 97af57ceb..398456821 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -156,8 +156,6 @@ module _3gpp-common-trace {
         description "Network Slice list";
         uses SliceIdScope;
         min-elements 1;
-        max-elements 1024;
-        key "sd sst";
       }
 
       list taiList {
-- 
GitLab


From d49764741bcb060b988032b80b9a71dd7c51aa5e Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 20 Nov 2024 14:59:19 +0000
Subject: [PATCH 13/34] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 398456821..1be9e42d1 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -110,16 +110,16 @@ module _3gpp-common-trace {
   grouping SliceIdScope {
     description "This <<datatype>> provides a PLMN Id and associated
       slice ids (S-NSSAI).";
-      
-    leaf plmnId {
-      description "It specifies a PLMN Id.";
-      type types3gpp:PLMNId;
-    }
 
-    leaf-list sliceIdList {
-      type types3gpp:SNssai;
-      min-elements 1;
-      description "It specifies slice identified by S-NSSAI.";
+    leaf pLMNId {
+      description "The PLMN Id.";
+      uses types3gpp:PLMNId;
+    }
+    
+    list sNSSAIList {
+      description "List of S-NSSAIs associated with the PLMN Id.";
+      key "sd sst";
+      uses types5g3gpp:SNssai;
     }
   } 
   
-- 
GitLab


From 86cef56d07e6e055c28a9d38f236d3c2e5f992c3 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 20 Nov 2024 15:01:30 +0000
Subject: [PATCH 14/34] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 1be9e42d1..d3a1cc59d 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -111,8 +111,10 @@ module _3gpp-common-trace {
     description "This <<datatype>> provides a PLMN Id and associated
       slice ids (S-NSSAI).";
 
-    leaf pLMNId {
+    list pLMNId {
       description "The PLMN Id.";
+      key "mcc";
+      max-elements 1;
       uses types3gpp:PLMNId;
     }
     
-- 
GitLab


From cbcd05d1813f1cbd56088b397376e6fcc77e8c91 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 20 Nov 2024 15:54:40 +0000
Subject: [PATCH 15/34] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index d3a1cc59d..62e3c40a2 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -107,21 +107,21 @@ module _3gpp-common-trace {
     }
   }
   
-  grouping SliceIdScope {
+  grouping SliceIdScopeGrp {
     description "This <<datatype>> provides a PLMN Id and associated
       slice ids (S-NSSAI).";
 
-    list pLMNId {
-      description "The PLMN Id.";
-      key "mcc";
-      max-elements 1;
+    list plmnId {
+      key "mcc mnc";
+      description "It specifies the PLMN Id of the NPN network.";
       uses types3gpp:PLMNId;
+      max-elements 1;
     }
-    
-    list sNSSAIList {
-      description "List of S-NSSAIs associated with the PLMN Id.";
-      key "sd sst";
-      uses types5g3gpp:SNssai;
+
+    list sliceIdList {
+      key idx;
+      description "It specifies the PNI-NPN identified by CAG ID ";
+      leaf idx { type types3gpp:SNssai; }
     }
   } 
   
@@ -156,7 +156,7 @@ module _3gpp-common-trace {
 
       list sliceIdList {
         description "Network Slice list";
-        uses SliceIdScope;
+        uses SliceIdScopeGrp;
         min-elements 1;
       }
 
-- 
GitLab


From 4e26a80373ae353e0596040654a7aa8c12acdd5b Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 20 Nov 2024 16:08:23 +0000
Subject: [PATCH 16/34] Update _3gpp-common-trace.yang

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

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 62e3c40a2..25f45a9c2 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -8,6 +8,7 @@ module _3gpp-common-trace {
   import _3gpp-common-yang-extensions {prefix yext3gpp; }
   import ietf-inet-types { prefix inet; }
   import _3gpp-common-files { prefix files3gpp; }
+  import _3gpp-5g-common-yang-types { prefix 5gtypes3gpp}
   
 
   organization "3GPP SA5";
@@ -121,7 +122,7 @@ module _3gpp-common-trace {
     list sliceIdList {
       key idx;
       description "It specifies the PNI-NPN identified by CAG ID ";
-      leaf idx { type types3gpp:SNssai; }
+      leaf idx { type 5gtypes3gpp:SNssai; }
     }
   } 
   
-- 
GitLab


From b25b97689c60aac67dee37aa848ea267e6cb1a8d Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 20 Nov 2024 16:10:36 +0000
Subject: [PATCH 17/34] Update _3gpp-common-trace.yang

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

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 25f45a9c2..ba66d8c1e 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -8,7 +8,7 @@ module _3gpp-common-trace {
   import _3gpp-common-yang-extensions {prefix yext3gpp; }
   import ietf-inet-types { prefix inet; }
   import _3gpp-common-files { prefix files3gpp; }
-  import _3gpp-5g-common-yang-types { prefix 5gtypes3gpp}
+  import _3gpp-5g-common-yang-types { prefix 5gtypes3gpp; }
   
 
   organization "3GPP SA5";
-- 
GitLab


From b2151c8b9cb5d30edbc36318315aafc6a3eaaf81 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 20 Nov 2024 16:43:14 +0000
Subject: [PATCH 18/34] Update _3gpp-common-trace.yang

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

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index ba66d8c1e..160e09f4d 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -4,11 +4,10 @@ module _3gpp-common-trace {
   prefix "trace3gpp";
 
   import _3gpp-common-top { prefix top3gpp; }
-  import _3gpp-common-yang-types {prefix types3gpp; }
   import _3gpp-common-yang-extensions {prefix yext3gpp; }
   import ietf-inet-types { prefix inet; }
   import _3gpp-common-files { prefix files3gpp; }
-  import _3gpp-5g-common-yang-types { prefix 5gtypes3gpp; }
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
   
 
   organization "3GPP SA5";
@@ -122,7 +121,7 @@ module _3gpp-common-trace {
     list sliceIdList {
       key idx;
       description "It specifies the PNI-NPN identified by CAG ID ";
-      leaf idx { type 5gtypes3gpp:SNssai; }
+      leaf idx { type types5g3gpp:SNssai; }
     }
   } 
   
-- 
GitLab


From 6b3ce586994af0c20612d8865064b10eac02c077 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 20 Nov 2024 16:51:27 +0000
Subject: [PATCH 19/34] Update _3gpp-common-trace.yang

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

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 160e09f4d..42714ec84 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -8,6 +8,7 @@ module _3gpp-common-trace {
   import ietf-inet-types { prefix inet; }
   import _3gpp-common-files { prefix files3gpp; }
   import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
+  import yang-models/_3gpp-common-yang-types { prefix types3gpp; }
   
 
   organization "3GPP SA5";
-- 
GitLab


From 96e9eb0a6d4745b54d1c79af98877c377f62ef5e Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 20 Nov 2024 17:03:20 +0000
Subject: [PATCH 20/34] Update _3gpp-common-trace.yang

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

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 42714ec84..fb2a5b074 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -122,7 +122,7 @@ module _3gpp-common-trace {
     list sliceIdList {
       key idx;
       description "It specifies the PNI-NPN identified by CAG ID ";
-      leaf idx { type types5g3gpp:SNssai; }
+      leaf idx { uses types5g3gpp:SNssai; }
     }
   } 
   
-- 
GitLab


From 9c7494248e63351566a7da2e736185e57248f722 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 20 Nov 2024 19:23:31 +0000
Subject: [PATCH 21/34] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index fb2a5b074..986d34bde 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -113,17 +113,18 @@ module _3gpp-common-trace {
       slice ids (S-NSSAI).";
 
     list plmnId {
-      key "mcc mnc";
-      description "It specifies the PLMN Id of the NPN network.";
+      description "It specifies the PLMN ID.";
       uses types3gpp:PLMNId;
+      key "mcc mnc";
       max-elements 1;
     }
 
     list sliceIdList {
-      key idx;
-      description "It specifies the PNI-NPN identified by CAG ID ";
-      leaf idx { uses types5g3gpp:SNssai; }
-    }
+      description "It specifies the list of associated slice Ids (S-NSSAI).";
+      min-elements 1;
+      key "mcc mnc";
+      uses types5g3gpp:SNssai;
+      }
   } 
   
 
-- 
GitLab


From 9ae671b9dc28d5da9453b1cb2e43ab6260fbd48d Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 20 Nov 2024 19:25:01 +0000
Subject: [PATCH 22/34] Update _3gpp-common-trace.yang

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

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 986d34bde..56241102a 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -8,7 +8,7 @@ module _3gpp-common-trace {
   import ietf-inet-types { prefix inet; }
   import _3gpp-common-files { prefix files3gpp; }
   import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
-  import yang-models/_3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
   
 
   organization "3GPP SA5";
-- 
GitLab


From 595026ffcfe8fe028cf44879f26211a5baf4fceb Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 20 Nov 2024 19:27:44 +0000
Subject: [PATCH 23/34] Update _3gpp-common-trace.yang

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

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 56241102a..5a081dc6f 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -122,7 +122,7 @@ module _3gpp-common-trace {
     list sliceIdList {
       description "It specifies the list of associated slice Ids (S-NSSAI).";
       min-elements 1;
-      key "mcc mnc";
+      key "sd sst";
       uses types5g3gpp:SNssai;
       }
   } 
-- 
GitLab


From 42f536e28e9df4c09cec4db9ed3b6e58db94ffbc Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 20 Nov 2024 19:31:06 +0000
Subject: [PATCH 24/34] Update _3gpp-common-trace.yang

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

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 5a081dc6f..ec442ca0a 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -110,7 +110,7 @@ module _3gpp-common-trace {
   
   grouping SliceIdScopeGrp {
     description "This <<datatype>> provides a PLMN Id and associated
-      slice ids (S-NSSAI).";
+      list of slice ids (S-NSSAI).";
 
     list plmnId {
       description "It specifies the PLMN ID.";
-- 
GitLab


From e6aafd5bf4c2da02be051325d2aaf1422470f15c Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Wed, 20 Nov 2024 19:59:51 +0000
Subject: [PATCH 25/34] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index ec442ca0a..793f0ce2d 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -158,8 +158,10 @@ module _3gpp-common-trace {
 
       list sliceIdList {
         description "Network Slice list";
+        key idx;
         uses SliceIdScopeGrp;
         min-elements 1;
+        leaf idx { type string; }
       }
 
       list taiList {
-- 
GitLab


From 87de886a2a6d140a7fbba630abfeaec5a9750ad4 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Thu, 21 Nov 2024 16:58:23 +0000
Subject: [PATCH 26/34] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 793f0ce2d..d6ec96152 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -108,26 +108,6 @@ module _3gpp-common-trace {
     }
   }
   
-  grouping SliceIdScopeGrp {
-    description "This <<datatype>> provides a PLMN Id and associated
-      list of slice ids (S-NSSAI).";
-
-    list plmnId {
-      description "It specifies the PLMN ID.";
-      uses types3gpp:PLMNId;
-      key "mcc mnc";
-      max-elements 1;
-    }
-
-    list sliceIdList {
-      description "It specifies the list of associated slice Ids (S-NSSAI).";
-      min-elements 1;
-      key "sd sst";
-      uses types5g3gpp:SNssai;
-      }
-  } 
-  
-
   grouping AreaScopeGrp {
     description "Represents the AreaScope dataType.
       This <<dataType>> defines the area scope of MDT and QoE.
@@ -159,8 +139,9 @@ module _3gpp-common-trace {
       list sliceIdList {
         description "Network Slice list";
         key idx;
-        uses SliceIdScopeGrp;
+        uses types3gpp:PLMNInfo;
         min-elements 1;
+        max-elements 1024;
         leaf idx { type string; }
       }
 
-- 
GitLab


From 068a21ac8c5db693079ca242303d1ddd26307ffd Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Thu, 21 Nov 2024 17:04:42 +0000
Subject: [PATCH 27/34] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 1 -
 1 file changed, 1 deletion(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index d6ec96152..9ea7c3eb9 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -7,7 +7,6 @@ module _3gpp-common-trace {
   import _3gpp-common-yang-extensions {prefix yext3gpp; }
   import ietf-inet-types { prefix inet; }
   import _3gpp-common-files { prefix files3gpp; }
-  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
   import _3gpp-common-yang-types { prefix types3gpp; }
   
 
-- 
GitLab


From 434db25f8dc83868f831fc88a0a4c8c8a20c1349 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Thu, 21 Nov 2024 17:16:00 +0000
Subject: [PATCH 28/34] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 9ea7c3eb9..45d416f96 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -8,7 +8,7 @@ module _3gpp-common-trace {
   import ietf-inet-types { prefix inet; }
   import _3gpp-common-files { prefix files3gpp; }
   import _3gpp-common-yang-types { prefix types3gpp; }
-  
+  import _3gpp-5g-common-yang-types.yang {prefix types5g3gpp; }
 
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -138,7 +138,7 @@ module _3gpp-common-trace {
       list sliceIdList {
         description "Network Slice list";
         key idx;
-        uses types3gpp:PLMNInfo;
+        uses types5g3gpp:PLMNInfo;
         min-elements 1;
         max-elements 1024;
         leaf idx { type string; }
-- 
GitLab


From aa77425bb8fa9329462dad7776586916b03cfe0a Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Thu, 21 Nov 2024 17:17:49 +0000
Subject: [PATCH 29/34] Update _3gpp-common-trace.yang

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

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 45d416f96..52473fabd 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -8,7 +8,7 @@ module _3gpp-common-trace {
   import ietf-inet-types { prefix inet; }
   import _3gpp-common-files { prefix files3gpp; }
   import _3gpp-common-yang-types { prefix types3gpp; }
-  import _3gpp-5g-common-yang-types.yang {prefix types5g3gpp; }
+  import _3gpp-5g-common-yang-types {prefix types5g3gpp; }
 
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
-- 
GitLab


From c44e986d7f8c7dfd37a39b908f4ab149833732d0 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Thu, 21 Nov 2024 17:20:44 +0000
Subject: [PATCH 30/34] Update _3gpp-common-trace.yang

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

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 52473fabd..0c83d314b 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -136,7 +136,7 @@ module _3gpp-common-trace {
       }
 
       list sliceIdList {
-        description "Network Slice list";
+        description "Network Slice Id list";
         key idx;
         uses types5g3gpp:PLMNInfo;
         min-elements 1;
-- 
GitLab


From 09f41751f7d07606e20fd14313debb16f613f99e Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Thu, 21 Nov 2024 20:09:17 +0000
Subject: [PATCH 31/34] Update _3gpp-common-trace.yang

---
 yang-models/_3gpp-common-trace.yang | 43 ++++++++---------------------
 1 file changed, 12 insertions(+), 31 deletions(-)

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 0c83d314b..a23a5d2b7 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -108,10 +108,7 @@ module _3gpp-common-trace {
   }
   
   grouping AreaScopeGrp {
-    description "Represents the AreaScope dataType.
-      This <<dataType>> defines the area scope of MDT and QoE.
-      The Area Scope for MDT is specified in clause 5.10.2 of TS 32.422.
-      The Area Scope for QoE is specified in clause 5.4 of TS 28.405.";    
+    description "This <<dataType>> defines an area scope.";
 
     choice AreaScopeChoice {
       leaf-list eutraCellIdList {
@@ -1441,14 +1438,10 @@ module _3gpp-common-trace {
     description "Defines the configuration parameters of IOC 
      TraceJob which are specific for MDT. The attribute 
      anonymizationOfMdtData specifies the level of anonymization 
-     of MDT data.  The optional attribute areaScope allows to 
-     specify the area in terms of cells or Tracking Area/Routing 
-     Area/Location area where the MDT data collection shall take 
-     place. In case of RLF_REPORT_ONLY and RCEF_REPORT_ONLY the 
-     optional attribute areaScope allows to specify the eNB or list 
-     of eNBs or gNB or list of gNBs where the reports should be 
-     collected.  The optional attribute sensorInformation allows to 
-     specify  the sensor information to include.  Based on the value 
+     of MDT data.  The attribute areaScope defines the area scope
+     of MDT, which is specified in clause 5.10.2 of TS 32.422.
+     The optional attribute sensorInformation allows to specify  
+     the sensor information to include.  Based on the value 
      configured for attribute jobType in IOC TraceJob, the attributes 
      immediateMdtConfig or loggedMdtConfig are available: In case of 
      IMMEDIATE_MDT_ONLY or IMMEDIATE_MDT_AND_TRACE the attribute 
@@ -1469,21 +1462,9 @@ module _3gpp-common-trace {
    list areaScope {
       key "idx";
       leaf idx { type uint32 ; }
-      description "It specifies the area where data shall be collected. 
-        List of eNB/list of gNB/eNB/gNB for RLF or RCEF.
-
-        List of cells/TA/LA/RA for signaling based MDT or management 
-        based Logged MDT.
-  
-        List of cells for management based Immediate MDT.
-
-        List of NPN IDs for management based MDT.
-  
-        Cell, TA, LA, RA are mutually exclusive.
-         
-        This attribute shall be present if MDT is supported.";
-        reference "Clause 5.10.2 of 3GPP TS 32.422";
-        
+      description "It specifies the area where data shall be collected. ";
+      min-elements 1;
+      max-elements 1;        
       uses AreaScopeGrp;      
     }
 
@@ -1749,22 +1730,22 @@ module _3gpp-common-trace {
         ManagedEntity playing a role of ServinGWFunction.
 
         In case of signaling based Trace/MDT, the traceTarget attribute shall 
-        be able to carry (IMSI or IMEI(SV)or SUPI), the mDTAreaScope attribute 
+        be able to carry (IMSI or IMEI(SV)or SUPI), the areaScope attribute 
         shall be able to carry a list of (cell or E-UtranCell or NRCellDU or 
         TA/LA/RA).
 
         In case of management based Immediate MDT, the traceTarget attribute
-        shall be null value, the mDTAreaScope attribute shall carry a list of
+        shall be null value, the areaScope attribute shall carry a list of
         (Utrancell or E-UtranCell or NRCellDU).
 
         In case of management based Logged MDT, the traceTarget attribute
         shall carry an eBs or a RNC or gNBs. The Logged MDT should be initiated 
-        on the specified eNB or RNC or gNB in traceTarget. The mDTAreaScope 
+        on the specified eNB or RNC or gNB in traceTarget. The areaScope 
         attribute shall carry a list of (Utrancell or E-UtranCell or NRCellDU or 
         TA/LA/RA).
 
         In case of RLF reporting, or RCEF reporting,  the traceTarget 
-        attribute shall be null value, the mDTAreaScope attribute shall carry 
+        attribute shall be null value, the areaScope attribute shall carry
         one or list of eNBs/gNBs";
       reference "3GPP TS 32.422";
     }
-- 
GitLab


From 9f33bcda6376879cfbd7a104afbbd303781a0d4d Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Thu, 21 Nov 2024 20:13:35 +0000
Subject: [PATCH 32/34] Update _3gpp-common-qmcjob.yang

---
 yang-models/_3gpp-common-qmcjob.yang | 52 +++++-----------------------
 1 file changed, 8 insertions(+), 44 deletions(-)

diff --git a/yang-models/_3gpp-common-qmcjob.yang b/yang-models/_3gpp-common-qmcjob.yang
index 5d991ae15..b69cd9a19 100644
--- a/yang-models/_3gpp-common-qmcjob.yang
+++ b/yang-models/_3gpp-common-qmcjob.yang
@@ -27,6 +27,7 @@ module _3gpp-common-qmcjob {
       Integration Reference Point (IRP);
       Information Service (IS)";
 
+  revision 2024-11-05 { reference CR-0480; }
   revision 2024-04-04 { reference CR-0334; } 
   revision 2023-09-18 { reference CR-0271 ; } 
   revision 2023-02-14 { reference "CR-0234"; }
@@ -50,12 +51,8 @@ module _3gpp-common-qmcjob {
     list areaScope {
       key "idx";
       leaf idx { type uint32 ; }
-      description "It specifies the area where data shall be collected. 
-        List of eNB/list of gNB/eNB/gNB for RLF or RCEF.
-        List of cells or Tracking Area for QMC.          
-        Cell, TA, LA, RA are mutually exclusive.";
-      reference "Clause 5.10.2 of 3GPP TS 32.422";
-        
+      description "It defines the area scope of QoE, which is specified
+       in clause 5.4 of TS 28.405.";   
       uses trace3gpp:AreaScopeGrp;      
     }
 
@@ -182,12 +179,15 @@ module _3gpp-common-qmcjob {
        producer. For details of Management Based Activation of QoE Measurement 
        Collection see clause 4.5 and for details of Signalling Based 
        Activation of QoE Measurement Collection see clause 4.6 of TS 28.405. 
-       The attributes areaScope and pLMNTarget are only relevant when 
+       The attribute  pLMNTarget is only relevant when 
        Management Based Activation is used and the attribute qoETarget is 
        only relevant when Signalling Based Activation is used. All other 
        attributes are common for both Management Based Activation and 
        Signalling Based Activation.
 
+       The areaScope attribute defines the area scope of QoE, which is 
+       specified in clause 5.4 of TS 28.405.
+
        When a MnS consumer wishes to deactivate a QMC Job, the MnS consumer 
        shall delete the corresponding QMCJob instance. 
        NOTE:  If the reporting is ongoing, when a request to delete a QMCJob 
@@ -198,43 +198,7 @@ module _3gpp-common-qmcjob {
        jobId can be used to associate  multiple QMCJob instances. For example, 
        it is possible to configure the same jobId value for multiple QMCJob 
        instances required to produce the data (e.g. Streaming services and 
-       MTSI reports) for a specific network analysis.
-       The QoE Measurement Collection provides capability for collecting QoE 
-       information from:
-       - UEs which are in the specified area in case of Management Based 
-       Activation or 
-       - an individual UE in case of Signalling Based Activation.
-       The QoE Measurement Collection enables collection of application layer 
-       from the UE for specified end user service type. The supported service 
-       types are:
-       - Streaming services, see TS 26.247. 
-       - MTSI services, see TS 26.114.
-       - VR services, see TS 26.118.
-       A QMCJob instance represents the job for collecting QoE measurements 
-       according to the job parameters. For details of the QoE measurement 
-       collection configuration parameters see clause 5 of TS 28.405. A QMCJob 
-       instance can be name-contained by SubNetwork or ManagedElement. 
-       A QMC Job is activated by creating a QMCJob object instance in the 
-       MnS producer. For details of Management Based Activation of QoE 
-       Measurement Collection see clause 4.5 and for details of Signalling 
-       Based Activation of QoE Measurement Collection see 
-       clause 4.6 of TS 28.405. The attributes areaScope and pLMNTarget are 
-       only relevant when Management Based Activation is used and the 
-       attribute qoETarget is only relevant when Signalling Based Activation 
-       is used. All other attributes are common for both Management Based 
-       Activation and Signalling Based Activation.
-
-       When a MnS consumer wishes to deactivate a QMC Job, the MnS consumer 
-       shall delete the corresponding QMCJob instance. 
-       NOTE:  If the reporting is ongoing, when a request to delete a QMCJob 
-       instance is received, the reporting does not end. The QMCJob instance 
-       is deleted, when the last reporting for the QMC Job expires.
-
-       The jobId attribute presents the job identifier of a QMCJob instance. 
-       The jobId can be used to associate  multiple QMCJob instances. 
-       example, it is possible to configure the same jobId value for multiple 
-       QMCJob instances required to produce the data (e.g. Streaming services 
-       and MTSI reports) for a specific network analysis.";
+       MTSI reports) for a specific network analysis.";
       key id;
       uses top3gpp:Top_Grp;
       container attributes {
-- 
GitLab


From 4146669de0eef5ef696daa4c6faed38b7945e3c8 Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Thu, 21 Nov 2024 20:15:16 +0000
Subject: [PATCH 33/34] Update _3gpp-common-trace.yang

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

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index a23a5d2b7..bf7095fb6 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -1463,7 +1463,7 @@ module _3gpp-common-trace {
       key "idx";
       leaf idx { type uint32 ; }
       description "It specifies the area where data shall be collected. ";
-      min-elements 1;
+      min-elements 0;
       max-elements 1;        
       uses AreaScopeGrp;      
     }
-- 
GitLab


From c83d4d1a44f87179dfd27975fecd2a1d16b4590b Mon Sep 17 00:00:00 2001
From: scottma <mark.scott@ericsson.com>
Date: Thu, 21 Nov 2024 22:43:38 +0000
Subject: [PATCH 34/34] Update _3gpp-common-trace.yang

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

diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index bf7095fb6..e5d73f687 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -137,7 +137,7 @@ module _3gpp-common-trace {
         key idx;
         uses types5g3gpp:PLMNInfo;
         min-elements 1;
-        max-elements 1024;
+        max-elements 16384;
         leaf idx { type string; }
       }
 
-- 
GitLab