From b80abb1d3663aab0e7f90510453113fe65f46dc1 Mon Sep 17 00:00:00 2001
From: zhaoxxian <zhaoxian7@huawei.com>
Date: Thu, 2 Apr 2026 06:48:58 +0000
Subject: [PATCH 1/3] Edit TS28561_NdtNrm.yaml for data generation

---
 OpenAPI/TS28561_NdtNrm.yaml | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/OpenAPI/TS28561_NdtNrm.yaml b/OpenAPI/TS28561_NdtNrm.yaml
index 019ecf97..3de3d0dc 100644
--- a/OpenAPI/TS28561_NdtNrm.yaml
+++ b/OpenAPI/TS28561_NdtNrm.yaml
@@ -60,6 +60,8 @@ components:
             $ref: '#/components/schemas/NDTInputDescription'
           nDTJobExecutionRequirements:
             $ref: '#/components/schemas/NdtJobExecutionReqts'
+          ndtDataGeneration:
+            $ref: '#/components/schemas/DataGeneration'
           collaboratingNDT:
             description: >-
               It indicates the related NDT Job contributing as a collaborator to the executed NDT Job. It describes the DN of the collaborated NDT Job
@@ -217,6 +219,33 @@ components:
         performanceDataScalingFactor:
           type: integer
           maxItems: 1
+    DataGeneration:  
+      type: object
+      properties:
+        nDTDataGenObject:
+          type: array
+          uniqueItems: true
+          items:
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+        dataGenType:
+          type: array
+          uniqueItems: true
+          items:
+            $ref: '#/components/schemas/SimulationData'
+        dataGenTimeWindow:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow'
+        dataGenQuantity:
+          $ref: '#/components/schemas/DataGenQuantity'
+    DataGenQuantity:
+      oneof:
+        - required: [ numberOfData ]
+        - required: [ dataGenPeriod ]
+      properties:
+        numberOfData:
+          type: integer
+        dataGenPeriod:
+          type: integer
+
 
 
   #------Definition of JSON arrays for name-contained IOCs ---------------#
-- 
GitLab


From 5f4aea59ad12f9fb04fc6190d8b61a0e961bbbf6 Mon Sep 17 00:00:00 2001
From: zhaoxxian <zhaoxian7@huawei.com>
Date: Thu, 2 Apr 2026 07:20:32 +0000
Subject: [PATCH 2/3] Edit TS28561_NdtNrm for data generation.yaml

---
 OpenAPI/TS28561_NdtNrm.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OpenAPI/TS28561_NdtNrm.yaml b/OpenAPI/TS28561_NdtNrm.yaml
index 3de3d0dc..8cc7eed3 100644
--- a/OpenAPI/TS28561_NdtNrm.yaml
+++ b/OpenAPI/TS28561_NdtNrm.yaml
@@ -237,6 +237,7 @@ components:
         dataGenQuantity:
           $ref: '#/components/schemas/DataGenQuantity'
     DataGenQuantity:
+      type: object
       oneof:
         - required: [ numberOfData ]
         - required: [ dataGenPeriod ]
-- 
GitLab


From 7783493232ed424fa5628ae68f32ced9a3369715 Mon Sep 17 00:00:00 2001
From: zhaoxxian <zhaoxian7@huawei.com>
Date: Thu, 2 Apr 2026 07:28:14 +0000
Subject: [PATCH 3/3] Edit TS28561_NdtNrm.yaml

---
 OpenAPI/TS28561_NdtNrm.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenAPI/TS28561_NdtNrm.yaml b/OpenAPI/TS28561_NdtNrm.yaml
index 8cc7eed3..d7065112 100644
--- a/OpenAPI/TS28561_NdtNrm.yaml
+++ b/OpenAPI/TS28561_NdtNrm.yaml
@@ -238,7 +238,7 @@ components:
           $ref: '#/components/schemas/DataGenQuantity'
     DataGenQuantity:
       type: object
-      oneof:
+      oneOf:
         - required: [ numberOfData ]
         - required: [ dataGenPeriod ]
       properties:
-- 
GitLab