From 32fa005b233930731f4fd3183f6b233b20d01a30 Mon Sep 17 00:00:00 2001
From: ruiyue <xuruiyue@huawei.com>
Date: Sun, 28 Sep 2025 11:38:02 +0000
Subject: [PATCH 1/2] Update file TS28623_ManagementDataCollectionNrm.yaml

---
 .../TS28623_ManagementDataCollectionNrm.yaml  | 34 +++++++++++++------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml
index d5ab9f7e6..bffd01b11 100644
--- a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml
+++ b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml
@@ -27,16 +27,22 @@ components:
       oneOf:
       - type: array
         items:
-          type: string
-          enum:
-            - COVERAGE
-            - CAPACITY
-            - ENERGY_EFFICIENCY
-            - MOBILITY
-            - ACCESSIBILITY
+          $ref: '#/components/schemas/MgmtDataCategory'
+        uniqueItems: true  
       - type: array
         items:
-          type: string
+          $ref: '#/components/schemas/MgmtDataName'
+        uniqueItems: true  
+    MgmtDataCategory:
+      type: string
+      enum:
+        - COVERAGE
+        - CAPACITY
+        - ENERGY_EFFICIENCY
+        - MOBILITY
+        - ACCESSIBILITY
+    MgmtDataName:
+      type: string
     NodeFilter:
       type: object
       properties:
@@ -74,7 +80,10 @@ components:
                 managementData:
                   $ref: '#/components/schemas/ManagementData'
                 targetNodeFilter:
-                  $ref: '#/components/schemas/NodeFilter'
+                  type: array
+                  items:
+                    $ref: '#/components/schemas/NodeFilter'
+                  uniqueItems: true  
                 collectionTimeWindow:
                   $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow'
                 reportingCtrl:
@@ -93,7 +102,12 @@ components:
                   type: boolean
                 jobId:
                   type: string
-
+          required:
+            - managementData
+            - targetNodeFilter
+            - collectionTimeWindow
+            - reportingCtrl
+            - jobId
 #-------- Definition of YAML arrays for name-contained IOCs ----------------------
     ManagementDataCollection-Multiple:
       type: array
-- 
GitLab


From 6dfc0c898d5234272c68373a08f5ca6e14b8a47a Mon Sep 17 00:00:00 2001
From: ruiyue <xuruiyue@huawei.com>
Date: Thu, 16 Oct 2025 05:19:57 +0000
Subject: [PATCH 2/2] Edit TS28623_ManagementDataCollectionNrm.yaml

---
 OpenAPI/TS28623_ManagementDataCollectionNrm.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml
index bffd01b11..2634c7773 100644
--- a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml
+++ b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml
@@ -27,13 +27,13 @@ components:
       oneOf:
       - type: array
         items:
-          $ref: '#/components/schemas/MgmtDataCategory'
+          $ref: '#/components/schemas/mgtDataCategory'
         uniqueItems: true  
       - type: array
         items:
-          $ref: '#/components/schemas/MgmtDataName'
+          $ref: '#/components/schemas/mgtDataName'
         uniqueItems: true  
-    MgmtDataCategory:
+    mgtDataCategory:
       type: string
       enum:
         - COVERAGE
@@ -41,7 +41,7 @@ components:
         - ENERGY_EFFICIENCY
         - MOBILITY
         - ACCESSIBILITY
-    MgmtDataName:
+    mgtDataName:
       type: string
     NodeFilter:
       type: object
-- 
GitLab