From 9ab1e6e47c136deef9caa641a962cf27d59a1aaa Mon Sep 17 00:00:00 2001
From: sunse <sean.sun@nokia-sbell.com>
Date: Tue, 6 May 2025 17:04:09 +0800
Subject: [PATCH 1/4] Rel19 CR0214 TS28.104 enhancement to stage 2 and stage 3
 for clause 8

---
 OpenAPI/TS28104_MdaReport.yaml | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml
index 46eaca579..8114e1e58 100644
--- a/OpenAPI/TS28104_MdaReport.yaml
+++ b/OpenAPI/TS28104_MdaReport.yaml
@@ -14,6 +14,22 @@ components:
   schemas:
 
 #-------- Definition of types-----------------------------------------------------
+    ProjectionDuration:
+      type: object
+      properties:
+        fromTime:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime
+        toTime:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime
+    PagingOptimizationAnalysisOutput:
+      type: object
+      properties:
+        oOCDuration:
+          $ref: '#/components/schemas/ProjectionDuration'
+        oOCLocation:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate'
+        oOCMap:
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea'
 
     MDAOutputs:
       type: object
@@ -21,10 +37,12 @@ components:
         mDAType:
           $ref: 'TS28104_MdaNrm.yaml#/components/schemas/MDAType'
         mDAOutputList:
-          type: array
-          uniqueItems: true
-          items:
-            $ref: '#/components/schemas/MDAOutputEntry'
+          oneOf:
+            - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/PagingOptimizationAnalysisOutput'          
+            - type: array
+              uniqueItems: true
+              items:
+                $ref: '#/components/schemas/MDAOutputEntry'
         analyticsWindow:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindowRo'
         confidenceDegree:
-- 
GitLab


From b1c40203090b078da9f1a318c058d1b0630c3623 Mon Sep 17 00:00:00 2001
From: sunse <sean.sun@nokia-sbell.com>
Date: Tue, 6 May 2025 17:06:11 +0800
Subject: [PATCH 2/4] correction to validation issues

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

diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml
index 8114e1e58..8864bd255 100644
--- a/OpenAPI/TS28104_MdaReport.yaml
+++ b/OpenAPI/TS28104_MdaReport.yaml
@@ -18,9 +18,9 @@ components:
       type: object
       properties:
         fromTime:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
         toTime:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
     PagingOptimizationAnalysisOutput:
       type: object
       properties:
-- 
GitLab


From 04fc9f516d0f7c9124a1640f3431b0ef45a83882 Mon Sep 17 00:00:00 2001
From: sunse <sean.sun@nokia-sbell.com>
Date: Tue, 6 May 2025 17:08:21 +0800
Subject: [PATCH 3/4] correction

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

diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml
index 8864bd255..ac374fda0 100644
--- a/OpenAPI/TS28104_MdaReport.yaml
+++ b/OpenAPI/TS28104_MdaReport.yaml
@@ -38,7 +38,7 @@ components:
           $ref: 'TS28104_MdaNrm.yaml#/components/schemas/MDAType'
         mDAOutputList:
           oneOf:
-            - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/PagingOptimizationAnalysisOutput'          
+            - $ref: '#/components/schemas/PagingOptimizationAnalysisOutput'          
             - type: array
               uniqueItems: true
               items:
-- 
GitLab


From 29cfb170492ae5dc726022e048cb084e3fc79a66 Mon Sep 17 00:00:00 2001
From: sunse <sean.sun@nokia-sbell.com>
Date: Wed, 21 May 2025 08:31:39 +0800
Subject: [PATCH 4/4] correct the cardinality Edit TS28104_MdaReport.yaml

---
 OpenAPI/TS28104_MdaReport.yaml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml
index ac374fda0..942a1cb6f 100644
--- a/OpenAPI/TS28104_MdaReport.yaml
+++ b/OpenAPI/TS28104_MdaReport.yaml
@@ -27,9 +27,17 @@ components:
         oOCDuration:
           $ref: '#/components/schemas/ProjectionDuration'
         oOCLocation:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate'
+          type: array
+          uniqueItems: true
+          items:
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate'
+          minItems: 1
         oOCMap:
-          $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea'
+          type: array
+          uniqueItems: true
+          items:
+            $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea'
+          minItems: 1
 
     MDAOutputs:
       type: object
-- 
GitLab